cloud-web-corejs 1.0.54-dev.203 → 1.0.54-dev.204

package/src/components/xform/form-render/indexMixin.js

@@ -1125,25 +1125,67 @@ modules = {
           n && n.setDisabled && n.setHidden(t);
         });
     },
-    findWidgetNameInSubForm: function (e) {
-      let t = [],
-        i = null,
-        n = function (t, n) {
-          t.options && t.options.name === e && (i = n.options.name);
-        };
-      if ((baseRefUtil.traverseFieldWidgets(this.widgetList, n), i)) {
-        let o = this.getWidgetRef(i);
-        if (o) {
-          let a = o.getRowIdData();
-          a
-          && a.length > 0
-          && a.forEach(function (i) {
-            t.push(e + '@row' + i);
-          });
+    findWidgetNameInSubForm(widgetName) {
+      let result = []
+      let subFormName = null
+      Object.keys(this.subFormRefList).forEach(sfName => {
+        const fwHandler = (fw) => {
+          if (fw.options.name === widgetName) {
+            subFormName = sfName
+          }
+        }
+
+        const sfRef = this.subFormRefList[sfName]
+        traverseFieldWidgetsOfContainer(sfRef.widget, fwHandler, true)
+      })
+
+      if (!!subFormName) {
+        let subFormRef = this.getWidgetRef(subFormName)
+        if (!!subFormRef) {
+          if(subFormRef.widget.type == "data-table"){
+            let rows = subFormRef.getValue();
+            if(rows){
+              rows.forEach(row => {
+                result.push( widgetName + '_' + row._X_ROW_KEY)
+              })
+            }
+
+          }else{
+            let rowIds = subFormRef.getRowIdData()
+            if (!!rowIds && (rowIds.length > 0)) {
+              rowIds.forEach(rid => {
+                result.push( widgetName + '@row' + rid)
+              })
+            }
+          }
+
         }
       }
-      return t;
+
+      return result
+    },
+
+    findFieldWidgetById(fieldId, staticWidgetsIncluded) {
+      return getFieldWidgetById(this.formJsonObj.widgetList, fieldId, staticWidgetsIncluded)
     },
+
+    getSubFormNameOfWidget(widgetName) {
+      let result = []
+      let subFormName = null
+      Object.keys(this.subFormRefList).forEach(sfName => {
+        const fwHandler = (fw) => {
+          if (fw.options.name === widgetName) {
+            subFormName = sfName
+          }
+        }
+
+        const sfRef = this.subFormRefList[sfName]
+        traverseFieldWidgetsOfContainer(sfRef.widget, fwHandler)
+      })
+
+      return subFormName
+    },
+
     changeLanguage: function (e) {
       baseRefUtil.changeLocale(e);
     },
@@ -2005,6 +2047,13 @@ modules = {
 
       return foundWidget;
     },
+    copyNewFieldWidget(origin) {
+      let newWidget = deepClone(origin);
+      newWidget.type = (newWidget.targetType || newWidget.type);
+      let tempId = generateId();
+      newWidget.id = newWidget.type.replace(/-/g, '') + tempId;
+      return newWidget
+    },
     doScriptAccess(scriptUuid, callback) {
       if (scriptUuid) {
         let scripts = this.formJson.formConfig.scriptList || [];

package/src/components/xform/utils/formula-util.js

@@ -2,7 +2,7 @@
 import {evalFn, getFieldWidgetById, traverseFieldWidgetsOfContainer} from "@base/components/xform/utils/util";
 import * as formulajs from '@formulajs/formulajs'
 import {EditorView} from "codemirror"
-import {MatchDecorator,Decoration,ViewPlugin,WidgetType} from "@codemirror/view"
+import {MatchDecorator, Decoration, ViewPlugin, WidgetType} from "@codemirror/view"
 import {translate} from "@base/components/xform/utils/i18n";
 
 class PlaceholderWidget extends WidgetType {
@@ -44,9 +44,9 @@ export const FORMULA_REG_EXP = /\{\{(\w+\.[^.]+\.\w+)}}/g
 const placeholderMatcher = new MatchDecorator({
   regexp: /\{\{(.+?)}}/g,
   decoration: (match) =>
-      Decoration.replace({
-        widget: new PlaceholderWidget(match[1])
-      })
+    Decoration.replace({
+      widget: new PlaceholderWidget(match[1])
+    })
 });
 
 
@@ -93,7 +93,8 @@ export const baseTheme = EditorView.baseTheme({
 });
 
 export function calculateFormula(VFR, DSV, formulaJs, formulaFieldRef, changedFieldRef) {
-  if (!!formulaFieldRef.subFormItemFlag && !!changedFieldRef.subFormItemFlag) {
+  if (formulaFieldRef.tableParam) {
+  } else if (!!formulaFieldRef.subFormItemFlag && !!changedFieldRef.subFormItemFlag) {
     /* 子表单字段变化，只能触发子表单同一行字段的计算公式重新计算！！ */
     if (changedFieldRef.subFormRowId !== formulaFieldRef.subFormRowId) {
       return
@@ -129,7 +130,7 @@ export function calculateFormula(VFR, DSV, formulaJs, formulaFieldRef, changedFi
  * @param formula
  * @param VFR
  */
-export function fieldIsUsedInFormula(fieldName, formula, VFR) {
+export function fieldIsUsedInFormula(fieldName, formula, VFR, fieldTarget) {
   const matchResult = formula.match(FORMULA_REG_EXP)
   if (!matchResult) {
     return false
@@ -138,14 +139,14 @@ export function fieldIsUsedInFormula(fieldName, formula, VFR) {
   let foundResult = false
   matchResult.forEach(mi => {
     const thirdPart = mi.split('.')[2]
-    const nodeType = thirdPart.substring(0, thirdPart.length -2)
+    const nodeType = thirdPart.substring(0, thirdPart.length - 2)
     if (nodeType === 'func') {
       return
     }
 
     const firstPart = mi.split('.')[0]
     const fieldId = firstPart.substring(2, firstPart.length)
-    const fieldSchema = getFieldWidgetById(VFR.formJsonObj.widgetList, fieldId, false)
+    let fieldSchema = getFieldWidgetById(VFR.formJsonObj.widgetList, fieldId, false)
     if (!fieldSchema) {
       console.error('The field used by formula not found: ', fieldId)
       console.error('The formula is: ', formula)
@@ -175,7 +176,7 @@ export function replaceFieldsAndFunctionsOfFormula(VFR, formulaFieldRef) {
   let quitFlag = false
   matchResult.forEach(mi => {
     const thirdPart = mi.split('.')[2]
-    const nodeType = thirdPart.substring(0, thirdPart.length -2)
+    const nodeType = thirdPart.substring(0, thirdPart.length - 2)
     if (nodeType === 'func') {
       const funcName = mi.split('.')[1]
       resultFormula = resultFormula.replace(mi, funcName)
@@ -192,9 +193,20 @@ export function replaceFieldsAndFunctionsOfFormula(VFR, formulaFieldRef) {
         resultFormula = resultFormula.replace(mi, fieldRef.getValue())
       } else {  //getWidgetRef找不到，则可能是子表单字段
         const subFormNameOfField = VFR.getSubFormNameOfWidget(fieldSchema.options.name)
-        if (!!formulaFieldRef.subFormItemFlag) {
+        if (!!formulaFieldRef.subFormItemFlag || formulaFieldRef.tableParam) {
           /* 如果当前计算字段是子表单字段，要判断公式中的子表单字段是否和当前计算字段是否属于同一子表单！！ */
-          if (subFormNameOfField === formulaFieldRef.subFormName) {
+
+
+          if (subFormNameOfField === formulaFieldRef?.parentWidget?.options?.name) {
+            let subFormRowId = formulaFieldRef.tableParam.row._X_ROW_KEY
+            fieldRef = VFR.getWidgetRef(fieldSchema.options.name + '_' + subFormRowId)
+            if (!!fieldRef) {
+              resultFormula = resultFormula.replaceAll(mi, fieldRef.getValue())
+            } else {
+              quitFlag = true
+              console.error('Field not found: ' + fieldSchema.options.label)
+            }
+          } else if (subFormNameOfField === formulaFieldRef.subFormName) {
             fieldRef = VFR.getWidgetRef(fieldSchema.options.name + '@row' + formulaFieldRef.subFormRowId)
             if (!!fieldRef) {
               resultFormula = resultFormula.replaceAll(mi, fieldRef.getValue())
@@ -206,10 +218,12 @@ export function replaceFieldsAndFunctionsOfFormula(VFR, formulaFieldRef) {
             console.error('Invalid formula!')
           }
         } else {
+          debugger
           /* 在主表单字段的计算公式中使用子表单字段，应将子表单所有记录同字段的值代入！！ */
           const subFormValue = VFR.formDataModel[subFormNameOfField]
           let allSubFieldValues = ''
-          const subFieldName = fieldSchema.options.name
+          // const subFieldName = fieldSchema.options.name
+          const subFieldName = fieldKeyName(fieldSchema)
           subFormValue.forEach((vi, idx) => {
             allSubFieldValues = (idx === 0) ? vi[subFieldName] : allSubFieldValues + ', ' + vi[subFieldName]
           })
@@ -222,6 +236,13 @@ export function replaceFieldsAndFunctionsOfFormula(VFR, formulaFieldRef) {
   return quitFlag ? null : resultFormula
 }
 
+function fieldKeyName(widget) {
+  let o = widget.options.name;
+  return (
+    (widget.options.keyNameEnabled && widget.options.keyName) || o
+  );
+}
+
 /**
  * 获取字段值
  */

package/src/components/xform/utils/util.js

@@ -1,7 +1,7 @@
 import Clipboard from "clipboard";
 import axios from "axios";
 import request from "../../../utils/request.js";
-import { decode } from "js-base64";
+import {decode} from "js-base64";
 
 export function getAccessUrl() {
   return SUPPORT_PREFIX + "/report_ins/getData";
@@ -176,7 +176,13 @@ export function traverseFieldWidgets(
     return;
   }
 
-  widgetList.forEach((w) => {
+  loopHandleWidget(widgetList, (w, parent) => {
+    if (w.formItemFlag || ((w.formItemFlag === false) && staticWidgetsIncluded)) {
+      handler(w, parent)
+    }
+  });
+
+  /* widgetList.forEach((w) => {
     if (w.formItemFlag || (w.formItemFlag === false && staticWidgetsIncluded)) {
       handler(w, parent);
     } else if (w.type === "grid") {
@@ -204,7 +210,7 @@ export function traverseFieldWidgets(
       //自定义容器
       traverseFieldWidgets(w.widgetList, handler, w, staticWidgetsIncluded);
     }
-  });
+  }); */
 }
 
 export function traverseContainerWidgets(
@@ -216,7 +222,20 @@ export function traverseContainerWidgets(
     return;
   }
 
-  widgetList.forEach((w) => {
+  loopHandleWidget(widgetList, (w, parent) => {
+    if (w.category === "container") {
+      if (
+        skipDialogAndDrawer &&
+        (w.type === "vf-dialog" || w.type === "vf-drawer")
+      ) {
+        //什么也不做
+      } else {
+        handler(w);
+      }
+    }
+  });
+
+  /* widgetList.forEach((w) => {
     if (w.category === "container") {
       if (
         skipDialogAndDrawer &&
@@ -255,7 +274,7 @@ export function traverseContainerWidgets(
         traverseContainerWidgets(w.widgetList, handler);
       }
     }
-  });
+  }); */
 }
 
 export function traverseAllWidgets(widgetList, handler) {
@@ -263,7 +282,11 @@ export function traverseAllWidgets(widgetList, handler) {
     return;
   }
 
-  widgetList.forEach((w) => {
+  loopHandleWidget(widgetList, (w, parent) => {
+    handler(w);
+  });
+
+  /* widgetList.forEach((w) => {
     handler(w);
 
     if (w.type === "grid") {
@@ -288,7 +311,7 @@ export function traverseAllWidgets(widgetList, handler) {
       //自定义容器
       traverseAllWidgets(w.widgetList, handler);
     }
-  });
+  }); */
 }
 
 function handleWidgetForTraverse(
@@ -303,6 +326,24 @@ function handleWidgetForTraverse(
   }
 }
 
+export const itemFieldMap = {
+  grid: "cols",
+  table: "rows",
+  "table-cell": "widgetList",
+  'h5-table': "rows",
+  "h5-table-cell": "widgetList",
+  tab: "tabs",
+  "tab-pane": "widgetList",
+  "grid-col": "widgetList",
+  "vf-box": "widgetList",
+  "card": "widgetList",
+  "detail": "panes",
+  "detail-pane": "widgetList",
+  "detail-h5": "panes",
+  "h5-card": "panes",
+  "h5-card-pane": "widgetList",
+}
+
 /**
  * 遍历容器内的字段组件
  * @param con
@@ -314,6 +355,10 @@ export function traverseFieldWidgetsOfContainer(
   handler,
   staticWidgetsIncluded = false
 ) {
+
+  /*loopHandleWidget([con],(w, parent)=>{
+		handleWidgetForTraverse(w, handler, staticWidgetsIncluded);
+  });*/
   if (con.type === "grid") {
     con.cols.forEach((col) => {
       col.widgetList.forEach((cw) => {
@@ -338,11 +383,36 @@ export function traverseFieldWidgetsOfContainer(
     con.widgetList.forEach((cw) => {
       handleWidgetForTraverse(cw, handler, staticWidgetsIncluded);
     });
+  } else if (con.type === "data-table") {
+    /*con.widgetList.forEach((cw) => {
+      handleWidgetForTraverse(cw, handler, staticWidgetsIncluded);
+    });*/
+    for (let column of con.options.tableColumns) {
+      if (column.widget) {
+        handleWidgetForTraverse(column.widget, handler, staticWidgetsIncluded);
+      }
+      if (column.widgetList) {
+        loopHandleWidget(column.widgetList, (cw) => {
+          handleWidgetForTraverse(cw, handler, staticWidgetsIncluded);
+        });
+      }
+    }
   } else if (con.category === "container") {
     //自定义容器
-    con.widgetList.forEach((cw) => {
+    /*let key = itemFieldMap[con.type]
+    con[key].forEach((cw) => {
       handleWidgetForTraverse(cw, handler, staticWidgetsIncluded);
-    });
+    });*/
+
+
+    /*con.widgetList.forEach(cw => {
+      handleWidgetForTraverse(cw, handler, staticWidgetsIncluded)
+    })*/
+    loopHandleWidgetItem(con, null, (w) => {
+      if (con.id != w.id)
+        handleWidgetForTraverse(w, handler, staticWidgetsIncluded)
+    })
+
   }
 }
 
@@ -387,6 +457,18 @@ export function traverseWidgetsOfContainer(
     containerHandler(con);
   }
 
+  /*loopHandleWidget([con], (cw, parent) => {
+    if (con.id !== cw.id) {
+      handleContainerTraverse(
+        cw,
+        fieldHandler,
+        containerHandler,
+        internalContainerCallFlag,
+        staticWidgetsIncluded
+      );
+    }
+  });*/
+
   if (con.type === "grid") {
     con.cols.forEach((col) => {
       if (internalContainerCallFlag) {
@@ -449,7 +531,8 @@ export function traverseWidgetsOfContainer(
     });
   } else if (con.category === "container") {
     //自定义容器
-    con.widgetList.forEach((cw) => {
+    let key = itemFieldMap[con.type]
+    con[key].forEach((cw) => {
       handleContainerTraverse(
         cw,
         fieldHandler,
@@ -545,6 +628,29 @@ export function getFieldWidgetByName(
   return foundWidget;
 }
 
+export const columnFormatMap = {
+  editInput: "input",
+  editNumber: "number",
+  editDate: "date",
+  editSelect: "select",
+  editSearch: "vabsearch",
+  editAttachment: "baseAttachment",
+  editStatus: "status",
+  aText: "a-text",
+  aLink: "a-link",
+  editDelete: "a-link",
+  editButton: "a-link",
+  button: "button",
+  addSiblingEditRow: "a-link",
+  addChildTreeRow: "a-link",
+  moveUpRow: "a-link",
+  moveDownRow: "a-link",
+  removeTreeRow: "a-link",
+  text: "text",
+  checkbox: "checkbox",
+  radio: "radio",
+};
+
 export function getFieldWidgetById(widgetList, fieldId, staticWidgetsIncluded) {
   if (!widgetList) {
     return null;
@@ -554,6 +660,19 @@ export function getFieldWidgetById(widgetList, fieldId, staticWidgetsIncluded) {
   let handlerFn = (widget) => {
     if (widget.id === fieldId) {
       foundWidget = widget;
+    } else if (widget.type == "data-table") {
+      for (let column of widget.options.tableColumns) {
+        if (column?.widget?.id + "" === fieldId) {
+          foundWidget = column.widget;
+          break
+        } else if (column.widgetList) {
+          loopHandleWidget(column.widgetList, (item1) => {
+            if (item1.id === fieldId) {
+              foundWidget = item1;
+            }
+          });
+        }
+      }
     }
   };
 
@@ -707,14 +826,14 @@ export function translateOptionItems(e, t, i, n) {
   var o = [];
   return (
     e &&
-      e.length > 0 &&
-      e.forEach(function (e) {
-        o.push({
-          [i]: e[i],
-          [n]: e[n],
-        });
-      }),
-    o
+    e.length > 0 &&
+    e.forEach(function (e) {
+      o.push({
+        [i]: e[i],
+        [n]: e[n],
+      });
+    }),
+      o
   );
 }
 
@@ -730,8 +849,8 @@ export function assembleAxiosConfig(arrayObj, DSV, VFR) {
         "false" === ai.value.toLowerCase() || "0" === ai.value
           ? (result[ai.name] = !1)
           : "true" === ai.value.toLowerCase() || "1" === ai.value
-          ? (result[ai.name] = !0)
-          : (result[ai.name] = null);
+            ? (result[ai.name] = !0)
+            : (result[ai.name] = null);
       } else if ("Variable" === ai.type) {
         result[ai.name] = eval(ai.value);
       } else if ("FormData" === ai.type) {
@@ -901,11 +1020,11 @@ export function getDSByName(e, t) {
   var i = null;
   return (
     t &&
-      e.dataSources &&
-      e.dataSources.forEach(function (e) {
-        e.uniqueName === t && (i = e);
-      }),
-    i
+    e.dataSources &&
+    e.dataSources.forEach(function (e) {
+      e.uniqueName === t && (i = e);
+    }),
+      i
   );
 }
 
@@ -929,9 +1048,9 @@ export function getSubFormNameByFieldId(o, e) {
         u.id === e && (n = s.name);
       };
       (s.type === "sub-form" || s.type === "grid-sub-form") &&
-        traverseFieldWidgetsOfContainer(s.container, c);
+      traverseFieldWidgetsOfContainer(s.container, c);
     }),
-    n
+      n
   );
 }
 
@@ -948,9 +1067,9 @@ export function fieldIsUsedInFormula(o, e, n) {
       const g = c.split(".")[0],
         y = g.substring(2, g.length);
       getFieldWidgetById(n.formJsonObj.widgetList, y, !1).options.name === o &&
-        (s = !0);
+      (s = !0);
     }),
-    s
+      s
   );
 }
 
@@ -965,12 +1084,12 @@ export function calculateFormula(o, e, n, l, s) {
   c = replaceFieldsAndFunctionsOfFormula(o, l);
   const u = c.match(/[A-Za-z]*/g);
   u &&
-    u.forEach((g) => {
-      if (!!g && findCalFunStartIndex(g) !== -1) {
-        const y = g.toUpperCase();
-        c = c.replace(g, "formulaJs." + y);
-      }
-    }),
+  u.forEach((g) => {
+    if (!!g && findCalFunStartIndex(g) !== -1) {
+      const y = g.toUpperCase();
+      c = c.replace(g, "formulaJs." + y);
+    }
+  }),
     console.log("formula: ", c),
     console.log("formulaFieldRef: ", l);
   const $ = evalFn(c, e, o, n);
@@ -1001,7 +1120,7 @@ export function replaceFieldsAndFunctionsOfFormula(o, e) {
           if (e.subFormItemFlag)
             w === e.subFormName
               ? ((v = o.getWidgetRef(f.options.name + "@row" + e.subFormRowId)),
-                v && (s = s.replaceAll(c, v.getValue())))
+              v && (s = s.replaceAll(c, v.getValue())))
               : console.error("Invalid formula!");
           else {
             const _ = o.formDataModel[w];
@@ -1015,7 +1134,7 @@ export function replaceFieldsAndFunctionsOfFormula(o, e) {
         }
       }
     }),
-    s
+      s
   );
 }
 
@@ -1142,8 +1261,8 @@ export function trimEx(o, e, n) {
     ? n === "left"
       ? o.replace(new RegExp("^%%" + e + "+", "g"), "")
       : n === "right"
-      ? o.replace(new RegExp("%%" + e + "+$", "g"), "")
-      : o.replace(new RegExp("^%%" + e + "+|%%" + e + "+$", "g"), "")
+        ? o.replace(new RegExp("%%" + e + "+$", "g"), "")
+        : o.replace(new RegExp("^%%" + e + "+|%%" + e + "+$", "g"), "")
     : o.replace(/^%s+|%s+$/g, "");
 }
 
@@ -1167,22 +1286,23 @@ export function objectKeysToArray(o) {
     Object.keys(o).forEach((n) => {
       e.push(n);
     }),
-    e
+      e
   );
 }
 
 //begin
-function loopHandleWidget(widgetList, callback) {
+export function loopHandleWidget(widgetList, callback) {
   widgetList &&
-    widgetList.length > 0 &&
-    widgetList.forEach(function (e) {
-      loopHandleWidgetItem(e, null, callback);
-    });
+  widgetList.length > 0 &&
+  widgetList.forEach(function (e) {
+    loopHandleWidgetItem(e, null, callback);
+  });
 }
+
 function loopHandleWidgetItem(e, p, callback) {
   if ("container" === e.category) {
     callback(e, p);
-    if ("vf-dialog" === e.type || "vf-drawer" === e.type);
+    if ("vf-dialog" === e.type || "vf-drawer" === e.type) ;
     else if ("data-table" === e.type) {
       if (!!e.widgetList) {
         e.widgetList.forEach((childItem) => {
@@ -1202,40 +1322,40 @@ function loopHandleWidgetItem(e, p, callback) {
       }
     } else if ("grid" === e.type) {
       e.cols &&
-        e.cols.length > 0 &&
-        e.cols.forEach(function (childItem) {
-          loopHandleWidgetItem(childItem, e, callback);
-        });
+      e.cols.length > 0 &&
+      e.cols.forEach(function (childItem) {
+        loopHandleWidgetItem(childItem, e, callback);
+      });
     } else if ("table" === e.type) {
       e.rows &&
-        e.rows.length > 0 &&
-        e.rows.forEach(function (rowItem) {
-          rowItem.cols &&
-            rowItem.cols.length > 0 &&
-            rowItem.cols.forEach(function (childItem) {
-              loopHandleWidgetItem(childItem, e, callback);
-            });
+      e.rows.length > 0 &&
+      e.rows.forEach(function (rowItem) {
+        rowItem.cols &&
+        rowItem.cols.length > 0 &&
+        rowItem.cols.forEach(function (childItem) {
+          loopHandleWidgetItem(childItem, e, callback);
         });
+      });
     } else if ("h5-table" === e.type) {
       e.rows &&
-        e.rows.length > 0 &&
-        e.rows.forEach(function (rowItem) {
-          rowItem.cols &&
-            rowItem.cols.length > 0 &&
-            rowItem.cols.forEach(function (childItem) {
-              loopHandleWidgetItem(childItem, e, callback);
-            });
+      e.rows.length > 0 &&
+      e.rows.forEach(function (rowItem) {
+        rowItem.cols &&
+        rowItem.cols.length > 0 &&
+        rowItem.cols.forEach(function (childItem) {
+          loopHandleWidgetItem(childItem, e, callback);
         });
+      });
     } else if ("tab" === e.type) {
       e.tabs &&
-        e.tabs.length > 0 &&
-        e.tabs.forEach(function (tabItem) {
-          tabItem.widgetList &&
-            tabItem.widgetList.length > 0 &&
-            tabItem.widgetList.forEach(function (childItem) {
-              loopHandleWidgetItem(childItem, e, callback);
-            });
+      e.tabs.length > 0 &&
+      e.tabs.forEach(function (tabItem) {
+        tabItem.widgetList &&
+        tabItem.widgetList.length > 0 &&
+        tabItem.widgetList.forEach(function (childItem) {
+          loopHandleWidgetItem(childItem, e, callback);
         });
+      });
     } else if ("detail" === e.type) {
       if (e.panes) {
         e.panes.forEach(function (childItem) {
@@ -1260,14 +1380,15 @@ function loopHandleWidgetItem(e, p, callback) {
       }
     } else {
       "grid-col" === e.type || e.type,
-        e.widgetList &&
-          e.widgetList.length > 0 &&
-          e.widgetList.forEach(function (childItem) {
-            loopHandleWidgetItem(childItem, e, callback);
-          });
+      e.widgetList &&
+      e.widgetList.length > 0 &&
+      e.widgetList.forEach(function (childItem) {
+        loopHandleWidgetItem(childItem, e, callback);
+      });
     }
   } else {
     callback && callback(e);
   }
 }
+
 //end