Browse Source

去除ext-trial水印/框架架构优化

zhuth 6 years ago
parent
commit
647beccfba

+ 2 - 0
app/view/main/ContentPanel.js

@@ -3,4 +3,6 @@ Ext.define('uas.view.main.ContentPanel', {
     xtype: 'contentPanel',
     id: 'content-panel',
     scrollable: true,
+
+    layout: 'fit'
 });

+ 0 - 27
app/view/main/List.js

@@ -1,27 +0,0 @@
-/**
- * This view is an example list of people.
- */
-Ext.define('uas.view.main.List', {
-    extend: 'Ext.grid.Panel',
-    xtype: 'mainlist',
-
-    requires: [
-        'uas.store.Personnel'
-    ],
-
-    title: 'Personnel',
-
-    store: {
-        type: 'personnel'
-    },
-
-    columns: [
-        { text: 'Name',  dataIndex: 'name' },
-        { text: 'Email', dataIndex: 'email', flex: 1 },
-        { text: 'Phone', dataIndex: 'phone', flex: 1 }
-    ],
-
-    listeners: {
-        select: 'onItemSelected'
-    }
-});

+ 1 - 7
app/view/main/Main.js

@@ -4,19 +4,13 @@ Ext.define('uas.view.main.Main', {
     layout: 'border',
     
     items: [{
-        region: 'north',
-        html: '<h1 class="x-panel-header">Page Title</h1>',
-        border: false,
-        margin: '0 0 5 0'
-    }, {
         region: 'west',
         collapsible: true,
-        title: '目1录',
+        title: '目录',
         width: 150,
         items: [{
             xtype: 'navigation-tree'
         }]
-        // could use a TreePanel or AccordionLayout for navigational items
     }, {
         region: 'center',
         xtype: 'contentPanel',

+ 0 - 87
app/view/main/Main.scss

@@ -1,87 +0,0 @@
-/*
- * This file contains styling for the Main view.
- */
-
-/*
- * Generates a set of style rules for the "navigation" tab UI.
- */
-@include extjs-tab-panel-ui(
-    $ui: 'navigation',
-    $ui-tab-background-color: transparent,
-    $ui-tab-background-color-over: #505050,
-    $ui-tab-background-color-active: #303030,
-    $ui-tab-background-gradient: 'none',
-    $ui-tab-background-gradient-over: 'none',
-    $ui-tab-background-gradient-active: 'none',
-    $ui-tab-color: #acacac,
-    $ui-tab-color-over: #c4c4c4,
-    $ui-tab-color-active: #fff,
-    $ui-tab-glyph-color: #acacac,
-    $ui-tab-glyph-color-over: #c4c4c4,
-    $ui-tab-glyph-color-active: #fff,
-    $ui-tab-glyph-opacity: 1,
-    $ui-tab-border-radius: 0,
-    $ui-tab-border-width: 0,
-    $ui-tab-inner-border-width: 0,
-    $ui-tab-padding: 24px,
-    $ui-tab-margin: 0,
-    $ui-tab-font-size: 15px,
-    $ui-tab-font-size-over: 15px,
-    $ui-tab-font-size-active: 15px,
-    $ui-tab-line-height: 19px,
-    $ui-tab-font-weight: bold,
-    $ui-tab-font-weight-over: bold,
-    $ui-tab-font-weight-active: bold,
-    $ui-tab-icon-width: 24px,
-    $ui-tab-icon-height: 24px,
-    $ui-tab-icon-spacing: 5px,
-    $ui-bar-background-color: #404040,
-    $ui-bar-background-gradient: 'none',
-    $ui-bar-padding: 0,
-    $ui-strip-height: 0
-);
-
-/*
- * Generates a set of style rules for the "navigation" panel UI.
- */
-@include extjs-panel-ui(
-    $ui: 'navigation',
-    $ui-header-color: #fff,
-    $ui-header-glyph-color: #fff,
-    $ui-header-glyph-opacity: 1,
-    $ui-header-font-size: 20px,
-    $ui-header-line-height: 24px,
-    $ui-header-font-weight: bold,
-    $ui-header-icon-height: 24px,
-    $ui-header-icon-width: 24px,
-    $ui-header-icon-spacing: 15px,
-    $ui-header-background-color: $base-color,
-    $ui-header-padding: 0,
-    $ui-header-text-margin: 36px,
-    $ui-header-noborder-adjust: false
-);
-
-.x-title-icon-navigation {
-    font-family: FontAwesome;
-    color: #fff;
-    font-size: 24px;
-    line-height: 24px;
-}
-
-.x-tab-icon-el-navigation {
-    font-family: FontAwesome;
-    color: #acacac;
-
-    .x-tab-over & {
-        color: #c4c4c4;
-    }
-
-    .x-tab-active & {
-        color: #fff;
-    }
-}
-
-.x-panel-header-title-navigation > .x-title-text-navigation:after {
-    top: 30px;
-    right: -24px;
-}

+ 2 - 2
ext/classic/theme-neutral/sass/var/panel/Panel.scss

@@ -953,9 +953,9 @@ $panel-ignore-frame-padding: dynamic(false);
 
                 @if $ext-trial {
                     &:after {
-                        font-family: ext-watermark;
+                        // font-family: ext-watermark;
                         font-size: ($ui-header-line-height + vertical($ui-header-padding)) * 0.75;
-                        content: 'd';
+                        // content: 'd';
                         position: absolute;
                         top: 0;
                         right: 0;

+ 2 - 2
ext/classic/theme-neutral/sass/var/window/Window.scss

@@ -634,9 +634,9 @@ $window-use-classic-header-padding: dynamic(false);
 
                 @if $ext-trial {
                     &:after {
-                        font-family: ext-watermark;
+                        // font-family: ext-watermark;
                         font-size: ($ui-header-line-height + vertical($ui-header-padding)) * 0.75;
-                        content: 'd';
+                        // content: 'd';
                         position: absolute;
                         top: 0;
                         right: 0;

+ 2 - 2
ext/modern/theme-base/sass/src/viewport/Viewport.scss

@@ -13,10 +13,10 @@
 
 @if $ext-trial {
     #ext-viewport:after {
-        font-family: ext-watermark;
+        // font-family: ext-watermark;
         text-shadow: 1px 1px #fff;
         font-size: 2em;
-        content: 'd';
+        // content: 'd';
         position: absolute;
         bottom: .5em;
         right: .5em;