Browse Source

从表数字类型右对齐

zhuth 7 years ago
parent
commit
63c6a5cdd3

+ 4 - 0
frontend/saas-web/app/util/FormUtil.js

@@ -90,6 +90,10 @@ Ext.define('saas.util.FormUtil', {
                                     Ext.apply(c.xtype, {
                                         format: 'Y-m-d H:i:s'
                                     });
+                                }else if(c.xtype == 'numbercolumn') {
+                                    Ext.applyIf(c, {
+                                        align: 'end'
+                                    });
                                 }
                                 
                                 var editor = c.editor;

+ 2 - 1
frontend/saas-web/app/view/core/form/FormPanel.js

@@ -85,7 +85,8 @@ Ext.define('saas.view.core.form.FormPanel', {
                     }
                 }, {
                     xtype: 'tbtext',
-                    html: '已审核',
+                    // html: '已审核',
+                    html: auditTexts.auditText,
                     cls: 'x-audited',
                     hidden: true,
                     bind: {

+ 22 - 1
frontend/saas-web/app/view/core/form/field/DetailGridField.scss

@@ -1,9 +1,30 @@
 .x-detailgridfield {
 
     .x-grid-view {
-        
+
         .x-grid-empty {
             padding: 8px 10px;
         }
     }
+}
+
+.x-grid-necessary .x-column-header-text:before{
+    content: '*';
+    font-size: 130%;
+    color: #ff0000;
+    width: 5px;
+    height: 5px;
+    margin-top: 4px;
+    margin-left: -10px;
+    position: absolute;
+}
+.x-grid-necessary{
+    text-align: center !important;
+    border-width: 1px;
+}
+.x-grid-necessary .x-column-header-text {
+    font: "microsoft yahei";
+    text-align: center;
+    font-size:14px;
+    font-weight: 500;
 }

+ 0 - 20
frontend/saas-web/app/view/main/Main.scss

@@ -127,26 +127,6 @@ $treelist-nav-ui: (
     color:#fff !important;
 }
 
-.x-grid-necessary .x-column-header-text:before{
-    content: '*';
-    font-size: 130%;
-    color: #ff0000;
-    width: 5px;
-    height: 5px;
-    margin-top: 4px;
-    margin-left: -10px;
-    position: absolute;
-}
-.x-grid-necessary{
-    text-align: center !important;
-    border-width: 1px;
-}
-.x-grid-necessary .x-column-header-text {
-    font: "microsoft yahei";
-    text-align: center;
-    font-size:14px;
-    font-weight: 500;
-}
 .x-query-menu {
     width:68px !important;
 }

+ 0 - 1
frontend/saas-web/app/view/sale/sale/FormPanel.js

@@ -186,7 +186,6 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 editor : {
                     xtype : ""
                 },
-                flex : 1.0,
             }
         ]
     }, {