Browse Source

主从表代码更新

hy 7 years ago
parent
commit
d11abdeb7c

+ 1 - 1
frontend/saas-web/app/view/core/dbfind/DbfindTrigger.js

@@ -94,7 +94,7 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
                         return reject(response);
                     }
                 });                
-                if(data!=null && data.length>2){
+                if(data!=null && data.length>2 && me.store && field.length>0){
                     me.store.loadData(data,false);
                     me.expand();
                 }else{

+ 18 - 3
frontend/saas-web/app/view/core/form/field/DetailGridField.js

@@ -8,6 +8,20 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
     margin: '0 5 5 0', // formpanel的fieldDefaults未生效
     height: 300,
 
+    requires: [
+        'Ext.selection.CellModel'
+    ],
+
+    selModel: {
+        type: 'cellmodel'
+    },
+    plugins: {
+        cellediting: {
+            clicksToEdit: 1
+        }
+    },
+
+
     store: {
         data: []
     },
@@ -36,13 +50,14 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
                 }]
             }]
         });
-        me.configUrl && me.GridUtil.setColumns(me, me.configUrl);
         me.callParent(arguments);
     },
 
     listeners: {
-        afterSetColumns: function(grid) {
-            grid.add10EmptyRow();
+        afterrender: function(grid) {
+            if(grid.store.count()==0){
+                grid.add10EmptyRow();
+            }
         },
         itemClick: function(tableView, record, item, index, e, eOpts) {
             var grid = tableView.up('grid'),

+ 0 - 10
frontend/saas-web/app/view/test/order/FormModel.js

@@ -2,14 +2,4 @@ Ext.define('saas.view.test.order.FormModel', {
     extend: 'saas.view.core.form.FormPanelModel',
     alias: 'viewmodel.test-order-formmodel',
 
-    data: {
-        num1:2,
-        id: 'TC-1032301'
-    },
-
-    formulas: {
-        sum: function(get) {
-            return get('num1') + get('num2');
-        }
-    }
 });

+ 0 - 2
frontend/saas-web/app/view/test/order/FormPanel.js

@@ -5,6 +5,4 @@ Ext.define('saas.view.test.order.FormPanel', {
     controller: 'test-order-formcontroller',
     viewModel: 'test-order-formmodel',
 
-    configUrl: 'resources/json/formItems.json',
-
 });