super-page-runtime 2.0.91 → 2.0.92

package/dist/es/components/runtime/utils/api/api-util.js

@@ -11,11 +11,15 @@ function refreshPage(pageContext, id) {
   });
 }
 function getFormData(pageContext, id) {
+  var _a;
   const pageType = pageContext.pageType;
   if (pageType && pageType === "form") {
     console.log("获取表单数据getData--pageContext=", pageContext);
     pageContext.canClick = false;
-    const isWorkflow = pageContext.workflowCode ? true : false;
+    let isWorkflow = false;
+    if ((_a = pageContext.props) == null ? void 0 : _a.activeWorkflow) {
+      isWorkflow = pageContext.workflowCode ? true : false;
+    }
     if (isWorkflow) {
       return getWorkflowFormData(pageContext, id);
     } else {
@@ -47,7 +51,7 @@ function getCommonFormData(pageContext, id) {
       id: dataId,
       systemCode,
       functionCode: permissionPrefix + ".gets",
-      listCodes: pageContext.listCodes
+      listCodesMap: pageContext.listCodesMap
     };
     if (!param.id && additionalParamMap && additionalParamMap._t_ && getSessionCache(additionalParamMap._t_ + "_id")) {
       param.id = getSessionCache(additionalParamMap._t_ + "_id");
@@ -67,13 +71,14 @@ function getCommonFormData(pageContext, id) {
     if (taskId) {
       param["taskId"] = taskId;
     }
-    if (pageContext.tableUuids) {
-      const listCodes = [];
+    console.log("getCommonFormData---listCodesMap=", pageContext.listCodesMap);
+    if (!pageContext.listCodesMap && pageContext.tableUuids) {
+      const listCodesMap = {};
       pageContext.tableUuids.forEach((tableUuid) => {
         const listCode = getListCode(pageCode, pageVersion, tableUuid);
-        listCodes.push(listCode);
+        listCodesMap[listCode] = listCode;
       });
-      param["listCodes"] = listCodes;
+      param["listCodesMap"] = listCodesMap;
     }
     if (pageContext.refercePropMap) {
       param["refercePropMap"] = pageContext.refercePropMap;
@@ -127,15 +132,16 @@ function getWorkflowFormData(pageContext, id) {
       isWorkflowEntity: true,
       systemCode,
       functionCode: permissionPrefix + ".gets",
-      listCodes: pageContext.listCodes
+      listCodesMap: pageContext.listCodesMap
     };
-    if (pageContext.tableUuids) {
-      const listCodes = [];
+    console.log("getWorkflowFormData---listCodesMap=", pageContext.listCodesMap);
+    if (!pageContext.listCodesMap && pageContext.tableUuids) {
+      const listCodesMap = {};
       pageContext.tableUuids.forEach((tableUuid) => {
         const listCode = getListCode(pageCode, pageVersion, tableUuid);
-        listCodes.push(listCode);
+        listCodesMap[listCode] = listCode;
       });
-      param["listCodes"] = listCodes;
+      param["listCodesMap"] = listCodesMap;
     }
     if (ids) {
       param["ids"] = formatAdditionalParamMapIds(ids);
@@ -296,8 +302,7 @@ function formatAdditionalParamMapIds(ids) {
       ids = ids.split(",");
     } else if (typeof ids === "number") {
       ids = [ids];
-    } else
-      ;
+    } else ;
   }
   return ids;
 }

package/dist/es/components/runtime/utils/assemblys-config.js

@@ -4,197 +4,230 @@ const assemblyGroups = [
     name: "container",
     label: "容器",
     icon: "assets/images/group-container.png",
-    items: [{
-      name: "form",
-      label: "表单",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/container/form/form-runtime.vue.js");
-      })
-    }, {
-      name: "card",
-      label: "卡片",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/container/card/card-runtime.vue.js");
-      })
-    }, {
-      name: "collapse",
-      label: "折叠面板",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/container/collapse/collapse-runtime.vue.js");
-      })
-    }, {
-      name: "layout",
-      label: "Flex",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/container/flex/flex-runtime.vue.js");
-      })
-    }, {
-      name: "tabs",
-      label: "Tabs",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/container/tabs/tabs-runtime.vue.js");
-      })
-    }, {
-      name: "tools",
-      label: "工具栏",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/container/tools/tools-runtime.vue.js");
-      })
-    }, {
-      name: "iframe",
-      label: "Iframe",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/container/iframe/iframe-runtime.vue.js");
-      })
-    }, {
-      name: "container",
-      label: "布局",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/container/container/container-runtime.vue.js");
-      })
-    }]
+    items: [
+      {
+        name: "form",
+        label: "表单",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/container/form/form-runtime.vue.js");
+        })
+      },
+      {
+        name: "card",
+        label: "卡片",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/container/card/card-runtime.vue.js");
+        })
+      },
+      {
+        name: "collapse",
+        label: "折叠面板",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/container/collapse/collapse-runtime.vue.js");
+        })
+      },
+      {
+        name: "layout",
+        label: "Flex",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/container/flex/flex-runtime.vue.js");
+        })
+      },
+      {
+        name: "tabs",
+        label: "Tabs",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/container/tabs/tabs-runtime.vue.js");
+        })
+      },
+      {
+        name: "tools",
+        label: "工具栏",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/container/tools/tools-runtime.vue.js");
+        })
+      },
+      {
+        name: "iframe",
+        label: "Iframe",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/container/iframe/iframe-runtime.vue.js");
+        })
+      },
+      {
+        name: "container",
+        label: "布局",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/container/container/container-runtime.vue.js");
+        })
+      }
+    ]
   },
   {
     name: "form",
     label: "表单",
-    items: [{
-      name: "input-text",
-      label: "文本框",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/form/input-text/inputtext-runtime.vue.js");
-      })
-    }, {
-      name: "select",
-      label: "下拉框",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/form/select/select-runtime.vue.js");
-      })
-    }, {
-      name: "radio",
-      label: "单选框",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/form/radio/radio-runtime.vue.js");
-      })
-    }, {
-      name: "checkbox",
-      label: "复选框",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/form/checkbox/checkbox-runtime.vue.js");
-      })
-    }, {
-      name: "textarea",
-      label: "文本域",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/form/textarea/textarea-runtime.vue.js");
-      })
-    }, {
-      name: "datePicker",
-      label: "日期/时间",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/form/date-picker/datepicker-runtime.vue.js");
-      })
-    }, {
-      name: "switch",
-      label: "开关",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/form/switch/switch-runtime.vue.js");
-      })
-    }, {
-      name: "inputNumber",
-      label: "计数器",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/form/input-number/input-number-runtime.vue.js");
-      })
-    }, {
-      name: "tag",
-      label: "标签",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/form/tag/tag-runtime.vue.js");
-      })
-    }, {
-      name: "richText",
-      label: "富文本",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/form/rich-text/richtext-runtime.vue.js");
-      })
-    }, {
-      name: "divider",
-      label: "分割线",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/form/divider/divider-runtime.vue.js");
-      })
-    }, {
-      name: "separatelabel",
-      label: "分割标签",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/form/separatelabel/separatelabel-runtime.vue.js");
-      })
-    }, {
-      name: "placeholder",
-      label: "占位符",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/form/placeholder/placeholder-runtime.vue.js");
-      })
-    }, {
-      name: "link",
-      label: "链接",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/form/link/link-runtime.vue.js");
-      })
-    }, {
-      name: "label",
-      label: "Label组件",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/form/label/label-runtime.vue.js");
-      })
-    }, {
-      name: "dept-tree",
-      label: "组织树",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/form/dept-tree/depttree-runtime.vue.js");
-      })
-    }, {
-      name: "file-upload",
-      label: "文件上传",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/form/file-upload/fileupload-runtime.vue.js");
-      })
-    }]
+    items: [
+      {
+        name: "input-text",
+        label: "文本框",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/form/input-text/inputtext-runtime.vue.js");
+        })
+      },
+      {
+        name: "select",
+        label: "下拉框",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/form/select/select-runtime.vue.js");
+        })
+      },
+      {
+        name: "radio",
+        label: "单选框",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/form/radio/radio-runtime.vue.js");
+        })
+      },
+      {
+        name: "checkbox",
+        label: "复选框",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/form/checkbox/checkbox-runtime.vue.js");
+        })
+      },
+      {
+        name: "textarea",
+        label: "文本域",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/form/textarea/textarea-runtime.vue.js");
+        })
+      },
+      {
+        name: "datePicker",
+        label: "日期/时间",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/form/date-picker/datepicker-runtime.vue.js");
+        })
+      },
+      {
+        name: "switch",
+        label: "开关",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/form/switch/switch-runtime.vue.js");
+        })
+      },
+      {
+        name: "inputNumber",
+        label: "计数器",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/form/input-number/input-number-runtime.vue.js");
+        })
+      },
+      {
+        name: "tag",
+        label: "标签",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/form/tag/tag-runtime.vue.js");
+        })
+      },
+      {
+        name: "richText",
+        label: "富文本",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/form/rich-text/richtext-runtime.vue.js");
+        })
+      },
+      {
+        name: "divider",
+        label: "分割线",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/form/divider/divider-runtime.vue.js");
+        })
+      },
+      {
+        name: "separatelabel",
+        label: "分割标签",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/form/separatelabel/separatelabel-runtime.vue.js");
+        })
+      },
+      {
+        name: "placeholder",
+        label: "占位符",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/form/placeholder/placeholder-runtime.vue.js");
+        })
+      },
+      {
+        name: "link",
+        label: "链接",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/form/link/link-runtime.vue.js");
+        })
+      },
+      {
+        name: "label",
+        label: "Label组件",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/form/label/label-runtime.vue.js");
+        })
+      },
+      {
+        name: "dept-tree",
+        label: "组织树",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/form/dept-tree/depttree-runtime.vue.js");
+        })
+      },
+      {
+        name: "file-upload",
+        label: "文件上传",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/form/file-upload/fileupload-runtime.vue.js");
+        })
+      }
+    ]
   },
   {
     name: "button",
     label: "按钮",
-    items: [{
-      name: "button-detail",
-      label: "按钮",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/button/button/button-runtime.vue.js");
-      })
-    }, {
-      name: "button-group",
-      label: "按钮组",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/button/button-group/buttongroup-runtime.vue.js");
-      })
-    }, {
-      name: "dropdown",
-      label: "下拉菜单",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/button/dropdown/dropdown-runtime.vue.js");
-      })
-    }, {
-      name: "print-label",
-      label: "打印标签",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/button/print-label/printlabel-runtime.vue.js");
-      })
-    }, {
-      name: "export-pdf",
-      label: "打印标签",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/button/export-pdf/exportpdf-runtime.vue.js");
-      })
-    }]
+    items: [
+      {
+        name: "button-detail",
+        label: "按钮",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/button/button/button-runtime.vue.js");
+        })
+      },
+      {
+        name: "button-group",
+        label: "按钮组",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/button/button-group/buttongroup-runtime.vue.js");
+        })
+      },
+      {
+        name: "dropdown",
+        label: "下拉菜单",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/button/dropdown/dropdown-runtime.vue.js");
+        })
+      },
+      {
+        name: "print-label",
+        label: "打印标签",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/button/print-label/printlabel-runtime.vue.js");
+        })
+      },
+      {
+        name: "export-pdf",
+        label: "打印标签",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/button/export-pdf/exportpdf-runtime.vue.js");
+        })
+      }
+    ]
   },
   {
     name: "workflow",
@@ -220,43 +253,56 @@ const assemblyGroups = [
         runtimeComponent: defineAsyncComponent(() => {
           return import("../views/assemblys/workflow/text-history/textflow-runtime.vue.js");
         })
+      },
+      {
+        name: "workflow-node",
+        label: "流程环节",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/workflow/workflow-node/workflownode-runtime.vue.js");
+        })
       }
     ]
   },
   {
     name: "chart",
     label: "统计图",
-    items: [{
-      name: "chart-column-line",
-      label: "柱/折图",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/chart/column-line/column-line-runtime.vue.js");
-      })
-    }, {
-      name: "chart-pie",
-      label: "饼图",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/chart/pie/pie-runtime.vue.js");
-      })
-    }, {
-      name: "chart-gauge",
-      label: "仪表盘",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/chart/gauge/gauge-runtime.vue.js");
-      })
-    }, {
-      name: "chart-radar",
-      label: "雷达图",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/chart/radar/radar-runtime.vue.js");
-      })
-    }, {
-      name: "chart-scatter",
-      label: "散点图",
-      runtimeComponent: defineAsyncComponent(() => {
-        return import("../views/assemblys/chart/scatter/scatter-runtime.vue.js");
-      })
-    }]
+    items: [
+      {
+        name: "chart-column-line",
+        label: "柱/折图",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/chart/column-line/column-line-runtime.vue.js");
+        })
+      },
+      {
+        name: "chart-pie",
+        label: "饼图",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/chart/pie/pie-runtime.vue.js");
+        })
+      },
+      {
+        name: "chart-gauge",
+        label: "仪表盘",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/chart/gauge/gauge-runtime.vue.js");
+        })
+      },
+      {
+        name: "chart-radar",
+        label: "雷达图",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/chart/radar/radar-runtime.vue.js");
+        })
+      },
+      {
+        name: "chart-scatter",
+        label: "散点图",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/chart/scatter/scatter-runtime.vue.js");
+        })
+      }
+    ]
   },
   {
     name: "data",

package/dist/es/components/runtime/utils/common-util.d.ts

@@ -23,3 +23,4 @@ export declare function getWorkflowId(pageContext: any): any;
  * @returns
  */
 export declare function getPropClassName(configure: Component): any;
+export declare function isNumber(numStr: any): boolean;

package/dist/es/components/runtime/utils/common-util.js

@@ -115,6 +115,19 @@ function getPropClassName(configure) {
   }
   return propClassName;
 }
+function isNumber(numStr) {
+  try {
+    if (numStr !== void 0 && numStr !== null) {
+      const num = parseInt(numStr + "");
+      if (Number.isInteger(num)) {
+        return true;
+      }
+    }
+    return false;
+  } catch (error) {
+    return false;
+  }
+}
 export {
   deepCopy,
   getBaseUrl,
@@ -123,6 +136,7 @@ export {
   getRealRestApiPath,
   getWorkflowId,
   isArrayFn,
+  isNumber,
   packageTemplateFiles,
   upperFirstCase
 };