super-page-runtime 2.0.85 → 2.0.91

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

@@ -1204,18 +1204,17 @@ function workflowSaveFunc(params) {
 function dealCompleteTaskParam(commonEntity, isInit, pageContext, params, operationResult) {
   const pageCode = pageContext.code;
   const pageVersion = pageContext.version;
-  const formParam = commonEntity;
   let taskId;
-  if (formParam) {
-    if (isInit && formParam.entity) {
-      pageContext.entity.data = formParam.entity;
+  if (commonEntity) {
+    if (isInit) {
       pageContext.initFormNo = commonEntity.formNo;
       pageContext.emailTemplateCode = commonEntity.emailTemplateCode;
     }
-    if (formParam.entity) {
-      cacheFormDataId(formParam.entity.id || formParam.entity.ID, pageContext);
+    if (commonEntity.entity) {
+      pageContext.entity.data = commonEntity.entity;
+      cacheFormDataId(commonEntity.entity.id || commonEntity.entity.ID, pageContext);
     }
-    const completeTaskResult = formParam.completeTaskResult;
+    const completeTaskResult = commonEntity.completeTaskResult;
     if (completeTaskResult) {
       const completeTaskTipType = completeTaskResult.completeTaskTipType;
       if (completeTaskTipType && completeTaskTipType === "MESSAGE") {
@@ -1228,8 +1227,8 @@ function dealCompleteTaskParam(commonEntity, isInit, pageContext, params, operat
         return false;
       }
     }
-    if (formParam.completeTaskParam) {
-      const completeTaskParam = formParam.completeTaskParam;
+    if (commonEntity.completeTaskParam) {
+      const completeTaskParam = commonEntity.completeTaskParam;
       taskId = completeTaskParam.taskId;
       if (params) {
         params.taskId = taskId;
@@ -1243,8 +1242,8 @@ function dealCompleteTaskParam(commonEntity, isInit, pageContext, params, operat
     if (!pageContext.entity) {
       pageContext.entity = {};
     }
-    pageContext.entity.task = formParam.taskParamMap;
-    setStoreInfo(pageCode, pageVersion, "_currentActivityName", formParam.taskName);
+    pageContext.entity.task = commonEntity.taskParamMap;
+    setStoreInfo(pageCode, pageVersion, "_currentActivityName", commonEntity.taskName);
   }
   if (params) {
     params.operationResult = operationResult;

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

@@ -33,7 +33,7 @@ function convertToPageContext(pageDesign, pageRequest) {
     // 当前页面中表格对应的数据表名集合，后台保存子表记录时需要
     formNoRuleCode: pageDesign.props ? pageDesign.props.formNoRuleCode : null,
     // 表单编号规则
-    judgeHeavyList: pageDesign.props && pageDesign.props.judgeHeavyList.length > 0 ? pageDesign.props.judgeHeavyList : null,
+    judgeHeavyList: getJudgeHeavyList(pageDesign),
     // 判重组合字段集合配置
     // conversionCodes: pageDesign.conversionCodes, // 数据转换规则。按钮上配置的，此处不需要
     pageType: pageDesign.pageType,
@@ -84,6 +84,27 @@ function convertToPageContext(pageDesign, pageRequest) {
   pageContext.events = pageDesign.runtime && pageDesign.runtime.events ? pageDesign.runtime.events : [];
   return pageContext;
 }
+function getJudgeHeavyList(pageDesign) {
+  try {
+    if (pageDesign.props && pageDesign.props.judgeHeavyList.length > 0) {
+      pageDesign.props.judgeHeavyList.forEach((item) => {
+        if (item.duplicateFieldList && item.duplicateFieldList.length > 0) {
+          item.duplicateFieldList = item.duplicateFieldList.map((field) => {
+            if (typeof field === "string") {
+              return { propDbName: field };
+            }
+            return field;
+          });
+        }
+      });
+      return pageDesign.props.judgeHeavyList;
+    } else {
+      return null;
+    }
+  } catch (e) {
+    console.error("getJudgeHeavyList error:", e);
+  }
+}
 function getPageDimensions() {
   const winWidth = window.outerWidth;
   if (!winWidth) {

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

@@ -89,16 +89,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!configure.props || !configure.props.otherSettings) {
         return;
       }
-      if (configure.props.otherSettings.subtableSetting && configure.props.otherSettings.timeToInitializeSubTable && configure.props.otherSettings.subtableSetting.timeToInitializeSubTable.length > 0) {
+      if (configure.props.otherSettings.sourceQueryTableData && configure.props.otherSettings.timeToInitializeSubTable && configure.props.otherSettings.sourceQueryTableData.timeToInitializeSubTable.length > 0) {
         let flag = false;
-        if (configure.props.otherSettings.subtableSetting.timeToInitializeSubTable.indexOf("create") !== -1) {
+        if (configure.props.otherSettings.sourceQueryTableData.timeToInitializeSubTable.indexOf("create") !== -1) {
           if (dataModel.id || dataModel.ID) {
             flag = false;
           } else {
             flag = true;
           }
         }
-        if (configure.props.otherSettings.subtableSetting.timeToInitializeSubTable.indexOf("noData") !== -1) {
+        if (configure.props.otherSettings.sourceQueryTableData.timeToInitializeSubTable.indexOf("noData") !== -1) {
           const tableData = dataModel[prop];
           if (!tableData || tableData.length <= 0) {
             flag = true;
@@ -120,9 +120,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       listViewOptions.value["isPageInfo"] = false;
       listViewOptions.value["subTableData"] = getValue();
       listViewOptions.value.extraParam["subTableListViewCode"] = listCode;
-      listViewOptions.value.extraParam["subtableSetting"] = configure.props && configure.props.otherSettings ? JSON.stringify(configure.props.otherSettings.subtableSetting) : null;
+      listViewOptions.value.extraParam["subtableSetting"] = configure.props && configure.props.otherSettings ? JSON.stringify(configure.props.otherSettings) : null;
       listViewOptions.value.extraParam["additionalParamMap"] = additionalParamMap;
       listViewOptions.value.extraParam["entityMap"] = pageContext.entity.data;
+      listViewOptions.value.extraParam["contextMap"] = pageContext.entity.context;
+      listViewOptions.value.extraParam["taskMap"] = pageContext.entity.task;
       setGridDataEventOptions();
       listViewShowFlag.value = false;
       setTimeout(() => {

package/dist/es/components/runtime/views/assemblys/form/date-picker/datepicker-runtime.vue2.js

@@ -52,6 +52,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           if (Array.isArray(value)) {
             setVariableValue(entity, dynamicFields, value[0]);
             setVariableValue(entity, dynamicFields2, value[1]);
+          } else if (value === null) {
+            setVariableValue(entity, dynamicFields, null);
+            setVariableValue(entity, dynamicFields2, null);
           }
         } else {
           setVariableValue(entity, dynamicFields, value);
@@ -125,9 +128,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             size: designProperty.value.size,
             placeholder: designProperty.value.placeholder,
             "start-placeholder": designProperty.value.placeholder,
-            "end-placeholder": designProperty.value.endPlaceholder,
+            "end-placeholder": designProperty.value.endPlaceholder ? designProperty.value.endPlaceholder : designProperty.value.placeholder,
             format: designProperty.value.format,
-            "value-format": designProperty.value.valueFormat ? "x" : designProperty.value.valueFormat,
+            "value-format": designProperty.value.valueFormat ? designProperty.value.valueFormat : "x",
             modelValue: dynamicModelMethod.value,
             "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => dynamicModelMethod.value = $event),
             shortcuts: shortcuts.value,
@@ -136,7 +139,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             onBlur: _cache[2] || (_cache[2] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "blur")),
             onFocus: _cache[3] || (_cache[3] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "focus")),
             onVisibleChange: _cache[4] || (_cache[4] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "visible-change")),
-            onPanelChange: _cache[5] || (_cache[5] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "panel-change"))
+            onPanelChange: _cache[5] || (_cache[5] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "panel-change")),
+            onClear: _cache[6] || (_cache[6] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "clear"))
           }, null, 8, ["is-range", "clearable", "disabled", "readonly", "size", "placeholder", "start-placeholder", "end-placeholder", "format", "value-format", "modelValue", "shortcuts", "type"])) : (openBlock(), createBlock(_component_el_date_picker, {
             key: 1,
             clearable: designProperty.value.clearable,
@@ -145,18 +149,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             size: designProperty.value.size,
             placeholder: designProperty.value.placeholder,
             "start-placeholder": designProperty.value.placeholder,
-            "end-placeholder": designProperty.value.endPlaceholder,
+            "end-placeholder": designProperty.value.endPlaceholder ? designProperty.value.endPlaceholder : designProperty.value.placeholder,
             format: designProperty.value.format,
             modelValue: dynamicModelMethod.value,
-            "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => dynamicModelMethod.value = $event),
+            "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => dynamicModelMethod.value = $event),
             shortcuts: shortcuts.value,
             type: designProperty.value.dateType,
-            "value-format": designProperty.value.valueFormat ? "x" : designProperty.value.valueFormat,
-            onChange: _cache[7] || (_cache[7] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "change")),
-            onBlur: _cache[8] || (_cache[8] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "blur")),
-            onFocus: _cache[9] || (_cache[9] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "focus")),
-            onVisibleChange: _cache[10] || (_cache[10] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "visible-change")),
-            onPanelChange: _cache[11] || (_cache[11] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "panel-change"))
+            "value-format": designProperty.value.valueFormat ? designProperty.value.valueFormat : "x",
+            onChange: _cache[8] || (_cache[8] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "change")),
+            onBlur: _cache[9] || (_cache[9] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "blur")),
+            onFocus: _cache[10] || (_cache[10] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "focus")),
+            onVisibleChange: _cache[11] || (_cache[11] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "visible-change")),
+            onPanelChange: _cache[12] || (_cache[12] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "panel-change")),
+            onClear: _cache[13] || (_cache[13] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "clear"))
           }, null, 8, ["clearable", "disabled", "readonly", "size", "placeholder", "start-placeholder", "end-placeholder", "format", "modelValue", "shortcuts", "type", "value-format"]))
         ]),
         _: 1

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

@@ -18,12 +18,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const dynamicModelMethod = computed({
       get() {
         let val = getVariableValue(entity, dynamicFields);
+        console.log("select组件----dynamicModelMethod---get-111-val", val);
         if (val !== void 0 && val !== null) {
           val = val + "";
         }
+        console.log("select组件----dynamicModelMethod---get222--val", val);
         return val;
       },
       set(value) {
+        console.log("select组件----dynamicModelMethod---set--value", value);
         setVariableValue(entity, dynamicFields, value);
       }
     });
@@ -37,6 +40,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     if (cacheOptions.length > 0) {
       listOptions.value = cacheOptions;
     }
+    console.log("select组件----listOptions.value=", listOptions.value);
     const queryLoadingFlag = ref(false);
     const dataOrigin = props.configure.props && props.configure.props.dataOrigin ? props.configure.props.dataOrigin : {};
     const valueType = dataOrigin.optionValueSetType;

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

@@ -21,18 +21,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       designProperty.value.activeValue = "1";
     }
     if (designProperty.value.inactiveValue === void 0 || designProperty.value.inactiveValue === null) {
-      designProperty.value.activeValue = "0";
+      designProperty.value.inactiveValue = "0";
     }
     const switchStyle = runtimeInfo.switchStyle;
     const dynamicModelMethod = computed({
       get() {
+        debugger;
         let val = getVariableValue(entity, dynamicFields);
         if (val !== void 0 && val !== null) {
-          val = val = "";
+          val = val + "";
         }
         return val;
       },
       set(value) {
+        debugger;
         setVariableValue(entity, dynamicFields, value);
       }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.0.85",
+  "version": "2.0.91",
   "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.58",
+    "agilebuilder-ui": "1.0.59",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",