super-page-runtime 2.0.31 → 2.0.35

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

@@ -33,7 +33,7 @@ function getCommonFormData(pageContext) {
     const pageCode = pageContext.code;
     const pageVersion = pageContext.version;
     const additionalParamMap = getAdditionalParamMap(pageContext);
-    const dataId = additionalParamMap && additionalParamMap.id ? additionalParamMap.id : 1;
+    const dataId = additionalParamMap && additionalParamMap.id ? additionalParamMap.id : null;
     const ids = additionalParamMap ? additionalParamMap.ids : null;
     const taskId = additionalParamMap ? additionalParamMap.taskId : null;
     const permissionPrefix = pageCode;
@@ -46,13 +46,13 @@ function getCommonFormData(pageContext) {
       id: dataId,
       systemCode,
       functionCode: permissionPrefix + ".gets",
-      tableNames: pageContext.tableNames
+      listCodes: pageContext.listCodes
     };
     if (!param.id && additionalParamMap && additionalParamMap._t_ && getSessionCache(additionalParamMap._t_ + "_id")) {
       param.id = getSessionCache(additionalParamMap._t_ + "_id");
     }
     if (ids) {
-      param["ids"] = ids;
+      param["ids"] = formatAdditionalParamMapIds(ids);
     }
     if (pageContext.notIdInitializationList) {
       param["noIdAndTaskIdInitSetting"] = JSON.stringify(pageContext.notIdInitializationList);
@@ -72,7 +72,7 @@ function getCommonFormData(pageContext) {
         const listCode = getListCode(pageCode, pageVersion, tableUuid);
         listCodes.push(listCode);
       });
-      param["tableNames"] = listCodes;
+      param["listCodes"] = listCodes;
     }
     const urlForView = backendUrl + "/dsc/commons/gets";
     http.post(urlForView, param).then((commonEntity) => {
@@ -109,7 +109,7 @@ function getWorkflowFormData(pageContext) {
     const pageCode = pageContext.code;
     const pageVersion = pageContext.version;
     const additionalParamMap = getAdditionalParamMap(pageContext);
-    const dataId = additionalParamMap && additionalParamMap.id ? additionalParamMap.id : null;
+    const dataId = additionalParamMap && additionalParamMap.id ? additionalParamMap.id : 25;
     const ids = additionalParamMap ? additionalParamMap.ids : null;
     const taskId = additionalParamMap ? additionalParamMap.taskId : null;
     const permissionPrefix = pageCode;
@@ -121,10 +121,18 @@ function getWorkflowFormData(pageContext) {
       isWorkflowEntity: true,
       systemCode,
       functionCode: permissionPrefix + ".gets",
-      tableNames: pageContext.tableNames
+      listCodes: pageContext.listCodes
     };
+    if (pageContext.tableUuids) {
+      const listCodes = [];
+      pageContext.tableUuids.forEach((tableUuid) => {
+        const listCode = getListCode(pageCode, pageVersion, tableUuid);
+        listCodes.push(listCode);
+      });
+      param["listCodes"] = listCodes;
+    }
     if (ids) {
-      param["ids"] = ids;
+      param["ids"] = formatAdditionalParamMapIds(ids);
     }
     if (taskId) {
       param["taskId"] = this.taskId;
@@ -271,6 +279,18 @@ function changeActionPermissionToMap(pageContext) {
   }
   pageContext.actionPermissionMap = actionPermissionMap;
 }
+function formatAdditionalParamMapIds(ids) {
+  if (ids) {
+    if (typeof ids === "string") {
+      ids = ids.split(",");
+    } else if (typeof ids === "number") {
+      ids = [ids];
+    } else {
+      console.error("ids参数类型错误");
+    }
+  }
+  return ids;
+}
 window["$PageUtil"] = functions;
 export {
   getFormData,

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

@@ -9,7 +9,7 @@ function generateCodeByRule(rules, data) {
           value += "".padEnd(item.length, item.supplementaryCharacters);
         } else {
           if (filedValue.length > item.length) {
-            value += filedValue.substring(0, item.supplementaryCharacters);
+            value += filedValue.substring(0, item.length);
           } else {
             value += filedValue.padEnd(item.length, item.supplementaryCharacters);
           }

package/dist/es/components/runtime/utils/events/standard-event.js

@@ -265,7 +265,7 @@ function exportFormReport(pageContext, configureObj, templateFile, isPdf) {
     tableName,
     isPermission: isPermission + "",
     systemCode,
-    tableNames: pageContext.tableNames,
+    listCodes: pageContext.listCodes,
     pageCode: pageContext.code,
     pageVersion: pageContext.version
   };
@@ -383,7 +383,7 @@ function saveFunc(params, isListButton) {
     }
   });
 }
-function getCommonFormRequestParam(pageContext, configureObj, isUnControlVersion, mainDefaultValueColumns, dynamicColumnInfo, ids, row) {
+function getCommonFormRequestParam(pageContext, configureObj, isUnControlVersion, mainDefaultValueColumns, dynamicColumnInfo, ids2, row) {
   const isWorkflow = pageContext.workflowCode ? true : false;
   const systemCode = pageContext.systemCode;
   const isPermission = configureObj.props.base.isPermission === void 0 || configureObj.props.base.isPermission === "true" || configureObj.props.base.isPermission;
@@ -399,12 +399,12 @@ function getCommonFormRequestParam(pageContext, configureObj, isUnControlVersion
     isWorkflowEntity: isWorkflow,
     functionCode: functionCodes,
     isPermission: isPermission + "",
-    tableNames: pageContext.tableNames,
+    listCodes: pageContext.listCodes,
     pageCode: pageContext.code,
     pageVersion: pageContext.version
   };
-  if (ids) {
-    param["ids"] = ids;
+  if (ids2) {
+    param["ids"] = ids2;
   }
   if (pageContext.judgeHeavyList) {
     if (isArrayFn(pageContext.judgeHeavyList)) {
@@ -648,7 +648,7 @@ function submitForm(params, isListButton, eventName, url) {
     const configureObj = params.configureObj;
     const mainDefaultValueColumns = params.mainDefaultValueColumns;
     const dynamicColumnInfo = params.dynamicColumnInfo;
-    const ids = params.ids;
+    const ids2 = params.ids;
     const successOperation = configureObj.props.base.successOperation;
     let isUnControlVersion = false;
     if (successOperation && successOperation === "noOperation") {
@@ -662,7 +662,7 @@ function submitForm(params, isListButton, eventName, url) {
       mainDefaultValueColumns,
       dynamicColumnInfo,
       eventName,
-      ids
+      ids2
     );
     if (request) {
       request.then((data) => {
@@ -682,7 +682,7 @@ function submitForm(params, isListButton, eventName, url) {
     }
   });
 }
-function getSubmitFormRequest(pageContext, configureObj, url, isUnControlVersion, mainDefaultValueColumns, dynamicColumnInfo, eventName, ids) {
+function getSubmitFormRequest(pageContext, configureObj, url, isUnControlVersion, mainDefaultValueColumns, dynamicColumnInfo, eventName, ids2) {
   return new Promise((resolve, reject) => {
     const buttonName = configureObj.props.base.title;
     const operationI18nTip = "superPageRuntimeMessage.whetherToConfirm" + upperFirstCase(eventName);
@@ -703,7 +703,7 @@ function getSubmitFormRequest(pageContext, configureObj, url, isUnControlVersion
         isUnControlVersion,
         mainDefaultValueColumns,
         dynamicColumnInfo,
-        ids,
+        ids2,
         null
       );
       const baseUrl = getBaseUrl(backendUrl);
@@ -721,8 +721,8 @@ function getSubmitFormRequest(pageContext, configureObj, url, isUnControlVersion
 }
 function deleteFunc(params) {
   return new Promise((resolve, reject) => {
-    const ids = params.ids;
-    if (!ids || ids.length === 0) {
+    const ids2 = params.ids;
+    if (!ids2 || ids2.length === 0) {
       ElMessage({
         showClose: true,
         type: "warning",
@@ -752,12 +752,12 @@ function deleteFunc(params) {
       const isWorkflow = pageContext.workflowCode ? true : false;
       const functionCodes = getPermissionCodes(configureObj, pageContext);
       const param = {
-        ids,
+        ids: ids2,
         functionCode: functionCodes,
         isPermission: isPermission + "",
         systemCode,
         isWorkflowEntity: isWorkflow,
-        tableNames: pageContext.tableNames,
+        listCodes: pageContext.listCodes,
         pageCode: pageContext.code,
         pageVersion: pageContext.version
       };
@@ -950,11 +950,11 @@ function doImportFinally(params, fileObj) {
     console.log("error==", error);
   });
 }
-function judgeDataNumber(buttonConfigureObj, ids) {
+function judgeDataNumber(buttonConfigureObj, ids2) {
   const buttonConfigureBase = buttonConfigureObj.props.base;
   if (buttonConfigureBase.conditionsForExecution && buttonConfigureBase.conditionsForExecution !== "") {
     if (buttonConfigureBase.conditionsForExecution === "one") {
-      if (!ids || ids.length !== 1) {
+      if (!ids2 || ids2.length !== 1) {
         ElMessage({
           showClose: true,
           type: "warning",
@@ -965,7 +965,7 @@ function judgeDataNumber(buttonConfigureObj, ids) {
         return false;
       }
     } else if (buttonConfigureBase.conditionsForExecution === "more") {
-      if (!ids || ids.length <= 0) {
+      if (!ids2 || ids2.length <= 0) {
         ElMessage({
           showClose: true,
           type: "warning",
@@ -1038,7 +1038,7 @@ function getWorkflowSaveParams(params) {
     definitionId: pageContext.definitionId,
     functionCode: functionCodes,
     systemCode,
-    tableNames: pageContext.tableNames,
+    listCodes: pageContext.listCodes,
     pageCode: pageContext.code,
     pageVersion: pageContext.version
   };
@@ -1076,7 +1076,15 @@ function getWorkflowSaveParams(params) {
   const additionalParamMap = getAdditionalParamMap(pageContext);
   param["additionalParamMap"] = additionalParamMap;
   if (additionalParamMap.ids && additionalParamMap.ids.length > 0) {
-    param["ids"] = additionalParamMap.ids;
+    if (typeof additionalParamMap.ids === "string") {
+      param["ids"] = additionalParamMap.ids.split(",");
+    } else if (Array.isArray(additionalParamMap.ids)) {
+      param["ids"] = additionalParamMap.ids;
+    } else if (typeof ids === "number") {
+      param["ids"] = [additionalParamMap.ids];
+    } else {
+      console.error("ids参数类型错误");
+    }
   }
   const successOperation = configureObj.props.base.successOperation;
   if (successOperation && successOperation === "noOperation") {
@@ -1282,7 +1290,7 @@ function getTransactTaskParam(params) {
   const permissionPrefix = pageContext.code;
   const additionalParamMap = getAdditionalParamMap(pageContext);
   const dataId = dataModel.ID !== void 0 && dataModel.ID !== null ? dataModel.ID : dataModel.id;
-  ({
+  const requestParams = {
     beanName: pageContext.beanName,
     id: dataId,
     entity: dataModel,
@@ -1290,14 +1298,15 @@ function getTransactTaskParam(params) {
     tableName: pageContext.tableName,
     functionCode: permissionPrefix + ".xxx",
     isWorkflowEntity: true,
-    tableNames: pageContext.tableNames,
+    listCodes: pageContext.listCodes,
     pageCode: pageContext.code,
     pageVersion: pageContext.version
-  });
-  ({
+  };
+  requestParams["completeTaskParam"] = {
     taskId: pageContext.completeTaskParam.taskId,
     systemCode
-  });
+  };
+  return requestParams;
 }
 function getAdditionalParamMap(pageContext) {
   if (pageContext.entity) {

package/dist/es/components/runtime/utils/events/validator-util.js

@@ -200,14 +200,14 @@ function validateWorkflowFormDataModel(dataModel, pageContext) {
     const subTablePageInfo = pageContext.subTablePageInfo;
     let result = false;
     const handleModels = JSON.parse(JSON.stringify(dataModel));
-    let rules = pageContext.rules;
+    const rules = pageContext.workflowRules;
     if (!rules) {
       result = true;
     } else {
       result = validator(handleModels, rules, null, null, true);
     }
     if (result === true) {
-      let workflowFieldPermissionRules = pageContext.workflowRules;
+      const workflowFieldPermissionRules = pageContext.workflowRules;
       if (!workflowFieldPermissionRules) {
         result = true;
       } else {
@@ -291,7 +291,7 @@ function validateCommonFormDataModel(dataModel, pageContext, rules) {
 }
 function packageCustomRules(orgCustomRules, orgRules) {
   if (!orgCustomRules) {
-    return;
+    return orgRules;
   }
   if (!orgRules) {
     orgRules = {};

package/dist/es/components/runtime/utils/form/scan-util.js

@@ -19,7 +19,10 @@ function formatScanRuleSets(ruleList) {
 function packageScanRuleSets(scanRuleSets2) {
   return new Promise((resolve, reject) => {
     if (Object.keys(scanRuleSets2).length > 0) {
-      http.post("/dc/setting-barcode-analysis/by-codes", Object.keys(scanRuleSets2)).then((res2) => {
+      http.post(
+        window["$vueApp"].config.globalProperties.baseAPI + "/dc/setting-barcode-analysis/by-codes",
+        Object.keys(scanRuleSets2)
+      ).then((res2) => {
         res2.forEach((rule) => {
           const ruleOuts = JSON.parse(rule.barcodeAnalysisOuts);
           const needOutsFields = /* @__PURE__ */ new Set();
@@ -49,6 +52,7 @@ function analysisScanValue(scanValue, scanRuleSets) {
   if (!scanValue) {
     return null;
   }
+  debugger;
   const scanSets = Object.values(scanRuleSets);
   for (let i = 0; i < scanSets.length; i++) {
     const scanSet = scanSets[i];

package/dist/es/components/runtime/utils/interfaces/page-design-types.d.ts

@@ -57,7 +57,7 @@ export interface PageDesign extends Component {
     initChartServiceConfigs?: Array<any>;
     rules?: object;
     tableUuids?: Array<any>;
-    tableNames?: Array<any>;
+    listCodes?: Array<any>;
     formNoRuleCode?: string;
     judgeHeavyList?: Array<any>;
     conversionCodes?: Array<any>;
@@ -89,7 +89,7 @@ export interface PageContext extends Component {
     workflowVersion?: number;
     rules?: object;
     tableUuids?: Array<any>;
-    tableNames?: Array<any>;
+    listCodes?: Array<any>;
     formNoRuleCode?: string;
     judgeHeavyList?: Array<any>;
     conversionCodes?: Array<any>;

package/dist/es/components/runtime/utils/page-init-util.js

@@ -19,11 +19,14 @@ function convertToPageContext(pageDesign, pageRequest) {
     code: pageDesign.code,
     version: pageDesign.version,
     dimensions: pageDesign.dimensions,
+    systemCode: pageDesign.systemCode,
+    systemVersion: pageDesign.systemVersion,
+    backendUrl: pageDesign.backendUrl,
     rules: [],
     // rules: pageDesign.rules, // 表单验证规则。在runtime object-render中实时获得
     tableUuids: pageDesign.tableUuids,
     // 表格uuid集合
-    tableNames: pageDesign.tableNames,
+    listCodes: pageDesign.listCodes,
     // 当前页面中表格对应的数据表名集合，后台保存子表记录时需要
     formNoRuleCode: pageDesign.formNoRuleCode,
     // 表单编号规则

package/dist/es/components/runtime/utils/table-utils.js

@@ -6,7 +6,9 @@ function getDataTypeMapRequest(backendUrl, tableName) {
   return http.get(baseUrl + "/dsc/commons/tables/" + tableName + "/data-types");
 }
 function popupToPage(params) {
-  eventBus.$emit(params.pageCode + "_open-dialog", params);
+  const pageCode = params.pageContext && params.pageContext.code;
+  console.log("弹框显示页面--popupToPage====params=", params);
+  eventBus.$emit(pageCode + "_open-dialog", params);
 }
 export {
   getDataTypeMapRequest,

package/dist/es/components/runtime/views/assemblys/common/task-informition-dialog.vue.js

@@ -24,7 +24,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         });
         return;
       }
-      emits("result", this.selections[0]);
+      emits("result", selections.value[0]);
     }
     function select(selection) {
       selections.value = selection;

package/dist/es/components/runtime/views/assemblys/container/card/card-runtime.vue2.js

@@ -18,7 +18,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
     const headerStyle = runtimeInfo.headerStyle;
-    const contentClass = runtimeInfo.contentClass;
+    const contentStyle = runtimeInfo.contentStyle;
     function test() {
       props.configure.props.title = "teee";
     }
@@ -34,7 +34,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }, createSlots({
         default: withCtx(() => [
           createElementVNode("div", {
-            class: normalizeClass(unref(contentClass))
+            style: normalizeStyle(unref(contentStyle))
           }, [
             (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.configure.items, (element, itemIndex) => {
               return openBlock(), createBlock(_sfc_main$1, {
@@ -43,7 +43,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 configure: element
               }, null, 8, ["pageContext", "configure"]);
             }), 128))
-          ], 2)
+          ], 4)
         ]),
         _: 2
       }, [

package/dist/es/components/runtime/views/assemblys/container/flex/flex-runtime.vue2.js

@@ -1,6 +1,6 @@
-import { defineComponent, ref, resolveComponent, openBlock, createBlock, normalizeStyle, unref, normalizeClass, withCtx, createElementBlock, Fragment, renderList } from "vue";
+import { defineComponent, ref, resolveComponent, openBlock, createBlock, normalizeStyle, unref, normalizeClass, withCtx, createElementBlock, Fragment, renderList, createVNode } from "vue";
 import _sfc_main$1 from "../../object-render.vue.js";
-import "../../../../utils/global-refs.js";
+import { PageDimensions } from "../../../../utils/interfaces/page-design-types.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "flex-runtime",
   props: {
@@ -14,7 +14,26 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
     const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
+    if (props.configure.items) {
+      const pageDimensions = props.pageContext && props.pageContext.dimensions ? props.pageContext.dimensions : PageDimensions.PC;
+      for (let item of props.configure.items) {
+        const itemCommon = item.runtime && item.runtime.common ? item.runtime.common : {};
+        const sizeStyle = itemCommon.style ? itemCommon.style[pageDimensions + "_style"] : void 0;
+        const itemStyle = {};
+        if (sizeStyle) {
+          item.flexSpan = sizeStyle.flexSpan ? sizeStyle.flexSpan : -2;
+          Object.assign(itemStyle, sizeStyle);
+          delete itemStyle.height;
+          delete sizeStyle.width;
+        }
+        item.itemStyle = itemStyle;
+        if (itemCommon.style) {
+          itemCommon.style[pageDimensions + "_class"] = "";
+        }
+      }
+    }
     return (_ctx, _cache) => {
+      const _component_el_col = resolveComponent("el-col");
       const _component_el_row = resolveComponent("el-row");
       return openBlock(), createBlock(_component_el_row, {
         ref_key: "thisRef",
@@ -27,11 +46,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }, {
         default: withCtx(() => [
           (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.configure.items, (element, itemIndex) => {
-            return openBlock(), createBlock(_sfc_main$1, {
+            return openBlock(), createBlock(_component_el_col, {
               key: element.uuid,
-              pageContext: _ctx.pageContext,
-              configure: element
-            }, null, 8, ["pageContext", "configure"]);
+              style: normalizeStyle(element.itemStyle),
+              span: element.flexSpan
+            }, {
+              default: withCtx(() => [
+                createVNode(_sfc_main$1, {
+                  pageContext: _ctx.pageContext,
+                  configure: element
+                }, null, 8, ["pageContext", "configure"])
+              ]),
+              _: 2
+            }, 1032, ["style", "span"]);
           }), 128))
         ]),
         _: 1

package/dist/es/components/runtime/views/assemblys/container/form/form-runtime.vue2.js

@@ -1,4 +1,4 @@
-import { defineComponent, resolveComponent, openBlock, createBlock, unref, normalizeStyle, normalizeClass, withCtx, createElementBlock, Fragment, renderList } from "vue";
+import { defineComponent, ref, resolveComponent, openBlock, createBlock, unref, normalizeStyle, normalizeClass, withCtx, createElementBlock, toDisplayString, createCommentVNode, Fragment, renderList } from "vue";
 import _sfc_main$1 from "../../object-render.vue.js";
 import "../../../../utils/global-refs.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -14,8 +14,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
     const runtimeProps = runtimeInfo.props ? runtimeInfo.props : {};
-    const runtimeStyle = runtimeInfo.style;
+    const runtimeStyle = ref(runtimeInfo.style ? runtimeInfo.style : {});
     const runtimeClass = runtimeInfo.class;
+    const titleStyle = ref(runtimeInfo.titleStyle ? runtimeInfo.titleStyle : {});
     return (_ctx, _cache) => {
       const _component_el_form = resolveComponent("el-form");
       return openBlock(), createBlock(_component_el_form, {
@@ -23,10 +24,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         "label-width": unref(runtimeProps).labelWidth,
         "label-position": unref(runtimeProps).labelPosition,
         size: unref(runtimeProps).componentSize,
-        style: normalizeStyle(unref(runtimeStyle)),
+        style: normalizeStyle(runtimeStyle.value),
         class: normalizeClass(unref(runtimeClass))
       }, {
         default: withCtx(() => [
+          unref(runtimeProps).formTitle ? (openBlock(), createElementBlock("div", {
+            key: 0,
+            class: "amb-widget-form-title",
+            style: normalizeStyle(titleStyle.value)
+          }, toDisplayString(unref(runtimeProps).formTitle), 5)) : createCommentVNode("", true),
           (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.configure.items, (element, itemIndex) => {
             return openBlock(), createBlock(_sfc_main$1, {
               key: element.uuid,

package/dist/es/components/runtime/views/assemblys/data/bar-code/barcode-runtime.vue2.js

@@ -5,7 +5,7 @@ import { getFormModelFields } from "../../../../utils/page-init-util.js";
 import { generateCodeByRule } from "../../../../utils/barcode-util.js";
 import { getVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
 import { handleEvent } from "../../../../utils/events/event-util.js";
-import "agilebuilder-ui/src/utils/request";
+import http from "agilebuilder-ui/src/utils/request";
 const _hoisted_1 = ["src"];
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "barcode-runtime",
@@ -69,24 +69,28 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       });
     }
     function handleSelectedRule() {
-      const rule = JSON.parse(
-        '[{"fieldName":"-1","fixedValue":"|"},{"fixedValue":"","fieldLength":"10","suppliement":"x","fieldName":"passenger"},{"fixedValue":"","fieldLength":"","suppliement":"","fieldName":"passengerNumber"},{"fixedValue":"AAA","fieldLength":"","suppliement":"","fieldName":"-1"}]'
-      );
-      rule.forEach((item) => {
-        if (item.fieldName !== "-1" && item.fieldName !== -1) {
-          watchVariableNames.value.push(item.fieldName);
-          watch(
-            () => props.pageContext.entity.data[item.fieldName],
-            (newValue, oldValue) => {
-              if (newValue !== void 0 && newValue !== null) {
-                const codeValue = generateCodeByRule(rule, props.pageContext.entity.data);
-                if (codeValue) {
-                  generateCode(codeValue);
+      http.get(
+        window["$vueApp"].config.globalProperties.baseAPI + "/dc/setting-barcode-models/by-code/" + designProperty.value.generateRule
+      ).then((res) => {
+        const rule = JSON.parse(res.barcodeModelItems);
+        rule.forEach((item) => {
+          if (item.propDbName !== "-1" && item.propDbName !== -1) {
+            watchVariableNames.value.push(item.propDbName);
+            watch(
+              () => props.pageContext.entity.data[item.propDbName],
+              (newValue, oldValue) => {
+                if (newValue !== void 0 && newValue !== null) {
+                  const codeValue = generateCodeByRule(rule, props.pageContext.entity.data);
+                  if (codeValue) {
+                    generateCode(codeValue);
+                  }
                 }
               }
-            }
-          );
-        }
+            );
+          }
+        });
+      }).catch((error) => {
+        console.error("获取条码规则失败:", error);
       });
     }
     function generateFixedFormatCode() {

package/dist/es/components/runtime/views/assemblys/data/table/sub-table-runtime.vue.js

@@ -29,7 +29,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
     const entity = props.pageContext.entity ? props.pageContext.entity : {};
-    let dynamicFields = getModelFields(props.pageContext, props.configure, "${data." + prop + "}");
+    let dynamicFields = getModelFields(props.pageContext, props.configure, prop);
     const listViewShowFlag = ref(false);
     const baseURL = window["$vueApp"].config.globalProperties.baseURL;
     const listViewOptions = ref({
@@ -390,7 +390,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function getSelectionIds() {
       const dataIds = [];
-      if (selections.value !== null) {
+      if (selections.value) {
         selections.value.forEach((item) => {
           dataIds.push(item.id ? item.id : item.ID ? item.ID : null);
         });

package/dist/es/components/runtime/views/assemblys/form/dept-tree/depttree-runtime.vue2.js

@@ -52,8 +52,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             disabled: designProperty.value.state == "disabled",
             multiple: designProperty.value.multiple,
             treeType: designProperty.value.treeType,
-            modelValue: unref(dataModel)[unref(fieldName)],
-            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => unref(dataModel)[unref(fieldName)] = $event),
+            value: unref(dataModel)[unref(fieldName)],
             models: unref(dataModel),
             fields: unref(autoSetFields),
             size: designProperty.value.size,
@@ -61,7 +60,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             separator: designProperty.value.separator,
             onChange: changeValue,
             onShowTree: showTree
-          }, null, 8, ["disabled", "multiple", "treeType", "modelValue", "models", "fields", "size", "separator"])
+          }, null, 8, ["disabled", "multiple", "treeType", "value", "models", "fields", "size", "separator"])
         ]),
         _: 1
       }, 8, ["required", "class", "label-width", "style"]);

package/dist/es/components/runtime/views/assemblys/form/divider/divider-runtime.vue2.js

@@ -12,7 +12,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
     const headerStyle = runtimeInfo.headerStyle;
     const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
-    let contentVariable = designProperty.value;
+    let contentVariable = designProperty.value["value"];
     const dynamicValue = computed(() => {
       if (!contentVariable) {
         return "";

package/dist/es/components/runtime/views/super-page.vue.d.ts

@@ -26,6 +26,10 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         required: false;
     };
+    dimensions: {
+        type: StringConstructor;
+        required: false;
+    };
     publishVersion: {
         type: NumberConstructor;
         required: false;
@@ -68,6 +72,10 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         required: false;
     };
+    dimensions: {
+        type: StringConstructor;
+        required: false;
+    };
     publishVersion: {
         type: NumberConstructor;
         required: false;

package/dist/es/components/runtime/views/super-page.vue.js

@@ -9,7 +9,7 @@ import _sfc_main$3 from "./assemblys/common/task-informition-dialog.vue.js";
 import _sfc_main$4 from "./assemblys/common/remove-signer-dialog.vue.js";
 import eventBus from "../utils/eventBus.js";
 import { getFormData } from "../utils/api/api-util.js";
-import { getTaskInformitions, getRemoveSigner, exportFormReport, doImportFinally, doAddSigner, doCreateCopyTask, doAssign, doReturnTaskTo, doRemoveSigners, getAdditionalParamMap, updateValuesWhenCloseDialog, refreshFormOrListPage } from "../utils/events/standard-event.js";
+import { getTaskInformitions, getRemoveSigner, exportFormReport, doImportFinally, doAddSigner, doCreateCopyTask, doAssign, doReturnTaskTo, doRemoveSigners, updateValuesWhenCloseDialog, refreshFormOrListPage, getAdditionalParamMap } from "../utils/events/standard-event.js";
 import { ElMessage } from "element-plus";
 import { useI18n } from "vue-i18n";
 import { DepartmentUserTree } from "agilebuilder-ui";
@@ -51,6 +51,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       type: Boolean,
       required: false
     },
+    dimensions: {
+      type: String,
+      required: false
+    },
     // 系统版本号
     publishVersion: {
       type: Number,
@@ -99,12 +103,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const buttonPageContext = ref(null);
     const route = useRoute();
     function initPageDesign(pageDesign) {
-      console.log("pageDesign==", pageDesign);
-      pageContext.value = convertToPageContext(pageDesign, props.pageRequest);
+      const tempContext = convertToPageContext(pageDesign, props.pageRequest);
+      tempContext.isTest = props.isTest;
+      if (tempContext.isTest && props.dimensions) {
+        tempContext.dimensions = props.dimensions;
+      }
+      pageContext.value = tempContext;
       if (pageContext.value == null) {
         return;
       }
-      pageContext.value.isTest = props.isTest;
       setTimeout(() => {
         initOptionDatas(pageContext.value, pageDesign.initOptionConfigs);
       }, 0);
@@ -175,7 +182,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         parentPageContext.value = params.pageContext;
         parentConfigureObj.value = params.configureObj;
         parentEventParams.value = params.eventParams;
-        openDialog(parentConfigureObj.value, parentEventParams.value);
+        params.jumpPageSetting;
+        openDialog(parentConfigureObj.value, parentEventParams.value, params.jumpPageSetting);
       });
       watch(
         () => pageContext.value.isRefresh,
@@ -261,7 +269,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function sessionCacheDataId() {
       const dataModel = pageContext.value.entity.data;
       const dataIdSessio = dataModel.ID == null ? dataModel.id : dataModel.ID;
-      if (route.query._t_) {
+      if (route.query && route.query._t_ && dataIdSessio) {
         setSessionCache(route.query._t_ + "_id", dataIdSessio);
       }
     }
@@ -351,51 +359,66 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       showRemoveSigner.value = false;
       doRemoveSigners(buttonParams.value, selectRemoveTasks);
     }
-    const router = useRouter();
-    function openDialog(configureObj, eventParams) {
-      const myJumpPageSetting = configureObj && configureObj["props"] && configureObj["props"].linkPage ? configureObj["props"].linkPage : null;
-      if (myJumpPageSetting && myJumpPageSetting.jumpPageUrl) {
-        const additionalParamMap = getAdditionalParamMap(pageContext);
-        let dataId = eventParams ? eventParams.id : null;
-        let ids = eventParams ? eventParams.ids : null;
-        const dataModel = pageContext.value.entity.data;
-        const pageModel = pageContext.value.entity.page;
-        let entity = {};
-        if (pageModel) {
-          Object.assign(entity, pageModel);
-        }
-        if (dataModel) {
-          Object.assign(entity, dataModel);
-        }
-        jumpToPage(myJumpPageSetting, null, dataId, entity, additionalParamMap, ids).then(
-          (openPageParams) => {
-            if (openPageParams) {
-              const jumpMode = openPageParams.jumpMode;
-              const popPageSetting = openPageParams;
-              popPageSetting.parentPageCode = parentPageContext.value.code;
-              popPageSetting.parentPageVersion = parentPageContext.value.version;
-              popPageSetting.isNewPage = true;
-              if (jumpMode === "popup") {
-                eventBus.$on(
-                  eventPageInfo.value + "close-dialog",
-                  (params) => {
-                    closeFunc(params);
-                  }
-                );
-                jumpPageSetting.value = popPageSetting;
-                isShowDialog.value = true;
-              } else if (jumpMode === "refresh") {
-                router.push({
-                  path: "/dsc/page",
-                  query: popPageSetting
-                });
+    function getPopPageSetting(configureObj, eventParams, jumpPageSetting2) {
+      return new Promise((resolve, reject) => {
+        if (jumpPageSetting2) {
+          resolve(jumpPageSetting2);
+        } else {
+          const myJumpPageSetting = configureObj && configureObj["props"] && configureObj["props"].linkPage ? configureObj["props"].linkPage : null;
+          if (myJumpPageSetting && myJumpPageSetting.jumpPageUrl) {
+            const additionalParamMap = getAdditionalParamMap(pageContext);
+            let dataId = eventParams ? eventParams.id : null;
+            let ids = eventParams ? eventParams.ids : null;
+            const dataModel = pageContext.value.entity.data;
+            const pageModel = pageContext.value.entity.page;
+            let entity = {};
+            if (pageModel) {
+              Object.assign(entity, pageModel);
+            }
+            if (dataModel) {
+              Object.assign(entity, dataModel);
+            }
+            jumpToPage(myJumpPageSetting, null, dataId, entity, additionalParamMap, ids).then(
+              (openPageParams) => {
+                resolve(openPageParams);
               }
+            );
+          } else {
+            resolve(false);
+          }
+        }
+      });
+    }
+    const router = useRouter();
+    function openDialog(configureObj, eventParams, myJumpPageSetting) {
+      getPopPageSetting(configureObj, eventParams, myJumpPageSetting).then(
+        (openPageParams) => {
+          if (openPageParams) {
+            const jumpMode = openPageParams.jumpMode;
+            const popPageSetting = openPageParams;
+            popPageSetting.parentPageCode = parentPageContext.value.code;
+            popPageSetting.parentPageVersion = parentPageContext.value.version;
+            popPageSetting.isNewPage = true;
+            if (jumpMode === "popup") {
+              eventBus.$on(
+                eventPageInfo.value + "close-dialog",
+                (params) => {
+                  closeFunc(params);
+                }
+              );
+              jumpPageSetting.value = popPageSetting;
+              isShowDialog.value = true;
+            } else if (jumpMode === "refresh") {
+              router.push({
+                path: "/dsc/page",
+                query: popPageSetting
+              });
             }
+          } else {
+            console.error("页面配置信息不存在");
           }
-        );
-      } else {
-        console.error("页面配置信息不存在");
-      }
+        }
+      );
     }
     function closeFunc(params) {
       const jumpMode = params.jumpMode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.0.31",
+  "version": "2.0.35",
   "description": "AgileBuilder super page runtime",
   "license": "ISC",
   "main": "dist/es/index.js",
@@ -48,7 +48,7 @@
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "@vue/eslint-config-prettier": "^8.0.0",
     "@vue/test-utils": "^2.4.4",
-    "agilebuilder-ui": "1.0.23",
+    "agilebuilder-ui": "1.0.28",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",