Pārlūkot izejas kodu

combogridmuli 属性扩展问题

luoyifan 3 gadi atpakaļ
vecāks
revīzija
0a3b7122ea
1 mainītis faili ar 21 papildinājumiem un 8 dzēšanām
  1. 21 8
      src/lib/systemLib.ts

+ 21 - 8
src/lib/systemLib.ts

@@ -535,7 +535,7 @@ export function normId(value: string) {
  * @param propertyName
  * @param gridRefName
  */
-export function clearViewModelReloadGrid(sender, propertyName, gridRefName){
+export function clearViewModelReloadGrid(sender, propertyName, gridRefName) {
     const scope = lookupScope(sender)
     clearViewModelValues(scope.viewModel, propertyName)
     if (!gridRefName) {
@@ -782,11 +782,22 @@ export class SystemEventFu {
     })
     getGrid(@LibParam('定义文件', 'module')url) {
         return function (sender, config) {
-            // @ts-ignore
-            require([url], (grid) => {
-                sender.grid = grid.default
-                config.grid = grid.default
-            })
+            if (config.xtype == "combogridmulti") {
+                // @ts-ignore
+                require([url], (grid) => {
+                    _.forOwn(grid.default, (v, k) => {
+                        sender[k] = v
+                        sender.config[k] = v
+                    })
+                })
+
+            } else {
+                // @ts-ignore
+                require([url], (grid) => {
+                    sender.grid = grid.default
+                    config.grid = grid.default
+                })
+            }
         }
     }
 
@@ -1023,7 +1034,7 @@ export function evalFunction(data, express) {
 
     _.forOwn(data, (value, key) => {
         const match = key.match(/\-|\*|\\|\/|\!|\@|\#|\$|\%|\^|\&|\*|\(|\)/i)
-        if(match){
+        if (match) {
             key = key.substring(0, match.index)
         }
         keys.push(key)
@@ -1080,7 +1091,9 @@ export function getGridEditRows(grid) {
             // Ext.Msg.alert('提示', '请确保输入的数据正确', errFunc)
             return false
         } else {
-            if (_.findIndex(newRecords, (item)=>{return item === record}) >= 0) {
+            if (_.findIndex(newRecords, (item) => {
+                return item === record
+            }) >= 0) {
                 newRows.push(record.data)
             } else {
                 modifyRows.push(record.data)