super-page-runtime 2.1.22 → 2.1.27

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

@@ -4,8 +4,13 @@ import { isWorkflowPage, getBaseUrl, getListCode } from "../common-util.js";
 import { getAdditionalParamMap, dealCompleteTaskParam } from "../events/standard-event.js";
 import { packageCustomRules, getWorkflowRules } from "../events/validator-util.js";
 import { handleEvent } from "../events/event-util.js";
+import { ElMessage, ElMessageBox } from "element-plus";
 import { functions } from "./page-expose-util.js";
 function refreshPage(pageContext, id) {
+  if (!pageContext.entity.page) {
+    pageContext.entity.page = {};
+  }
+  pageContext.entity.page["_isRefresh"] = true;
   getFormData(pageContext, id).then((commonEntity) => {
     pageContext.isRefresh = true;
   });
@@ -68,7 +73,7 @@ function getCommonFormData(pageContext, id) {
       param["taskId"] = taskId;
     }
     console.log("getCommonFormData---listCodesMap=", pageContext.listCodesMap);
-    if (!pageContext.listCodesMap && pageContext.tableUuids) {
+    if ((!pageContext.listCodesMap || Object.keys(pageContext.listCodesMap).length === 0) && pageContext.tableUuids) {
       const listCodesMap = {};
       pageContext.tableUuids.forEach((tableUuid) => {
         const listCode = getListCode(pageCode, pageVersion, tableUuid);
@@ -292,11 +297,14 @@ function formatAdditionalParamMapIds(ids) {
       ids = ids.split(",");
     } else if (typeof ids === "number") {
       ids = [ids];
-    } else ;
+    } else
+      ;
   }
   return ids;
 }
 window["$PageUtil"] = functions;
+window["$message"] = ElMessage;
+window["$messageBox"] = ElMessageBox;
 export {
   getFormData,
   refreshPage

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

@@ -4,6 +4,7 @@ import eventBus from "../eventBus.js";
 import http from "agilebuilder-ui/src/utils/request";
 import { getAdditionalParamMap } from "../events/standard-event.js";
 import { i18nValidatePropRulesMessage } from "../events/validator-util.js";
+import { getBaseUrl } from "../common-util.js";
 const functions = {
   /**
    * 展示页面中的某个组件元素
@@ -266,6 +267,43 @@ const functions = {
     } else {
       console.error("tableUUid is undefined");
     }
+  },
+  // 根据key获得serverConfig中配置的信息
+  getServerConfigValue(key) {
+    return window["$vueApp"].config.globalProperties[key];
+  },
+  // 获得当前系统的后端访问路径
+  getBackendUrl(pageContext) {
+    return getBaseUrl(pageContext.backendUrl, false);
+  },
+  // 获得平台后端访问路径
+  getPlateBackendUrl() {
+    return window["$vueApp"].config.globalProperties.baseAPI;
+  },
+  // 获得实体
+  getEntity(pageContext) {
+    return pageContext.entity.data;
+  },
+  // 获得实体属性值
+  getEntityValue(pageContext, key) {
+    return pageContext.entity.data ? pageContext.entity.data[key] : null;
+  },
+  // 获得页面变量
+  getPageData(pageContext) {
+    return pageContext.entity.page;
+  },
+  // 获得页面变量属性值
+  getPageDataValue(pageContext, key) {
+    return pageContext.entity.page ? pageContext.entity.page[key] : null;
+  },
+  // 获得附加参数对象
+  getAdditionalParams(pageContext) {
+    return getAdditionalParamMap(pageContext);
+  },
+  // 获得附加参数对象
+  getAdditionalParamValue(pageContext, key) {
+    const param = getAdditionalParamMap(pageContext);
+    return param ? param[key] : null;
   }
 };
 function packageAllFeildsRules(pageContext, item) {

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

@@ -330,6 +330,19 @@ const assemblyGroups = [
         })
       }
     ]
+  },
+  {
+    name: "other",
+    label: "其他",
+    items: [
+      {
+        name: "custom",
+        label: "自定义",
+        runtimeComponent: defineAsyncComponent(() => {
+          return import("../views/assemblys/form/custom/custom-runtime.vue.js");
+        })
+      }
+    ]
   }
 ];
 function getRuntimeComponentByName(name) {

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

@@ -773,6 +773,8 @@ function submitForm(params, isListButton, eventName, url) {
     if (successOperation && successOperation === "noOperation") {
       isUnControlVersion = true;
     }
+    const tableUuid = configureObj.props.base.tableUuid ? configureObj.props.base.tableUuid : params.tableUuid;
+    const tableName = getTableNameByTableUuid(pageContext, tableUuid);
     const request = getSubmitFormRequest(
       pageContext,
       configureObj,
@@ -781,7 +783,8 @@ function submitForm(params, isListButton, eventName, url) {
       mainDefaultValueColumns,
       dynamicColumnInfo,
       eventName,
-      ids2
+      ids2,
+      tableName
     );
     if (request) {
       request.then((data) => {
@@ -801,7 +804,7 @@ function submitForm(params, isListButton, eventName, url) {
     }
   });
 }
-function getSubmitFormRequest(pageContext, configureObj, url, isUnControlVersion, mainDefaultValueColumns, dynamicColumnInfo, eventName, ids2) {
+function getSubmitFormRequest(pageContext, configureObj, url, isUnControlVersion, mainDefaultValueColumns, dynamicColumnInfo, eventName, ids2, tableName) {
   return new Promise((resolve, reject) => {
     const buttonName = configureObj.props.base.title;
     const operationI18nTip = "superPageRuntimeMessage.whetherToConfirm" + upperFirstCase(eventName);
@@ -825,6 +828,7 @@ function getSubmitFormRequest(pageContext, configureObj, url, isUnControlVersion
         ids2,
         null
       );
+      param.tableName = tableName;
       const baseUrl = getBaseUrl(backendUrl, pageContext.isTest);
       let path = baseUrl + url;
       path = getRealRestApiPath(path, systemCode, backendUrl, pageContext.isTest);

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

@@ -75,10 +75,25 @@ function getEndObjectRule(rule, props, currentProp) {
 }
 function getValidator(columns) {
   const rules = {};
+  if (columns) {
+    columns.forEach((editField) => {
+      const prop = editField.model;
+      if (prop && editField.validations) {
+        const validations = editField.validations;
+        if (prop.indexOf(".") > 0) {
+          setObjectPropRule(editField.prop, rules, validations);
+        } else {
+          if (validations && validations.length > 0) {
+            rules[prop] = [...validations];
+          }
+        }
+      }
+    });
+  }
   return rules;
 }
 function validator(entity, rules, columns, rowIndex, isSql) {
-  return validatorEntity(entity, rules, columns, rowIndex, true);
+  return validatorEntity(entity, rules, columns, rowIndex, true, isSql);
 }
 function sublistVerify(rules) {
   if (!rules) {
@@ -104,7 +119,7 @@ function sublistVerify(rules) {
 function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdate, isSql) {
   let validateRules = sublistVerify(rules);
   if ((!rules || rules === null) && columns) {
-    validateRules = getValidator();
+    validateRules = getValidator(columns);
   }
   if (!validateRules || Object.keys(validateRules).length === 0) {
     entity["validateErrorField"] = "";
@@ -122,6 +137,11 @@ function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdat
       if (errors) {
         result = errors[0].message;
         fieldName = errors[0]["field"];
+        if (typeof rowIndex !== "undefined" && rowIndex !== null) {
+          result = getI18n().t("superPageRuntimeMessage.recordLine", {
+            row: rowIndex + 1
+          }) + "，" + result;
+        }
         ElMessage({
           message: result,
           showClose: true,
@@ -134,11 +154,11 @@ function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdat
       }
       if (fieldName && isShouldRepeateValdate === true) {
         const reg1 = /[A-Z]+/;
-        if (reg1.test(fieldName) && entity[fieldName.toLowerCase()] !== void 0) {
+        if (isSql !== void 0 && isSql === true && reg1.test(fieldName) && entity[fieldName.toLowerCase()] !== void 0) {
           const copyEntity = JSON.parse(JSON.stringify(entity));
           copyEntity[fieldName.toUpperCase()] = entity[fieldName.toLowerCase()];
           delete copyEntity[fieldName.toLowerCase()];
-          result = validatorEntity(copyEntity, rules, columns, rowIndex, false);
+          result = validatorEntity(copyEntity, rules, columns, rowIndex, false, isSql);
         }
       }
     }
@@ -186,7 +206,7 @@ function validateWorkflowFormDataModel(dataModel, pageContext) {
     if (!rules || Object.keys(rules).length === 0) {
       result = true;
     } else {
-      result = validator(handleModels, rules, null, null);
+      result = validator(handleModels, rules, null, null, true);
     }
     if (result === true) {
       const workflowFieldPermissionRules = pageContext.workflowRules;
@@ -216,7 +236,7 @@ function validateWorkflowFormDataModel(dataModel, pageContext) {
         if (customUuids) {
           customUuids.forEach((componentUuid) => {
             const customRef = getComponentRef(pageContext, componentUuid);
-            if (customRef) {
+            if (customRef && customRef.validator) {
               validatorResult.push(customRef.validator());
             }
           });
@@ -250,7 +270,7 @@ function validateCommonFormDataModel(dataModel, pageContext, rules) {
     if (!rules || Object.keys(rules).length === 0) {
       resolve(handleModels);
     } else {
-      const validateEntityResult = validator(handleModels, rules, null, null);
+      const validateEntityResult = validator(handleModels, rules, null, null, true);
       if (validateEntityResult === true) {
         const validateResult = validateSubTables(pageContext);
         if (validateResult === true) {

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

@@ -80,7 +80,8 @@ function getTableQueryInfo(dataOriginInfo, pageContext2) {
           }
         }
       }
-      if (f.propValue) ;
+      if (f.propValue)
+        ;
       searchForm.push(tempObj);
     }
     infoObj.props.searchForm = searchForm;

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

@@ -138,7 +138,8 @@ function getRequestObject(pageRequest) {
       requestObj[paramStrs[0]] = paramStrs.length > 1 ? paramStrs[1] : "";
     }
   }
-  if (requestObj["_t_"]) ;
+  if (requestObj["_t_"])
+    ;
   return requestObj;
 }
 function packageAdditionalMapWithRoute(route, requestObj) {
@@ -323,6 +324,9 @@ function packageFormRules(pageContext, configure) {
     if (!allFieldsDisabled && configure.name !== "button-detail" && pageContext.fieldPermissionMap) {
       const propEditPermission = pageContext.fieldPermissionMap.get(propName);
       console.log("packageFormRules-----prop=", prop, "--propEditPermission=", propEditPermission);
+      if (!configure.runtime.props) {
+        configure.runtime.props = {};
+      }
       if (propEditPermission) {
         if (propEditPermission["canEdit"] === false) {
           configure.runtime.props.state = "disabled";

package/dist/es/components/runtime/views/assemblys/chart/column-line/column-line-runtime.vue2.js

@@ -34,6 +34,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const enableDrill = props.configure.props ? props.configure.props.enableDrill : null;
     const drillEndTrigger = props.configure.props ? props.configure.props.drillEndTrigger : null;
     const linkPage = props.configure.props ? props.configure.props.linkPage : null;
+    const linkPageMap = {};
+    if (props.configure.items) {
+      for (const item of props.configure.items) {
+        if (linkPage && linkPage.jumpPageUrl) {
+          linkPageMap[item.uuid] = linkPage;
+        } else if (item.props && item.props.linkPage && item.props.linkPage.jumpPageUrl) {
+          linkPageMap[item.uuid] = item.props.linkPage;
+        }
+      }
+    }
     const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
@@ -48,14 +58,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (resultData) {
         updateChartDatas(resultData);
       }
-      if (chartRef.value && (enableDrill || linkPage && linkPage.jumpPageUrl)) {
+      if (chartRef.value && (enableDrill || Object.keys(linkPageMap).length > 0)) {
         chartRef.value.chart.on("click", function(params) {
           if (enableDrill) {
             if (headerRef.value && headerRef.value.drill) {
               headerRef.value.drill(params, props.configure.cacheDatas);
             }
           } else {
-            clickToLink();
+            clickToLink(params);
           }
         });
       }
@@ -69,11 +79,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           headerRef.value.closeDrill(0);
         }
       } else if (drillEndTrigger === "clickEvent") {
-        clickToLink();
+        clickToLink(params);
       }
     }
-    function clickToLink() {
-      if (!linkPage || !linkPage.jumpPageUrl) {
+    function clickToLink(clickParams) {
+      console.log("clik0", clickParams);
+      if (clickParams.seriesIndex >= chartOption.series.length) {
+        return;
+      }
+      console.log("clik1", clickParams);
+      const selSerieUuid = chartOption.series[clickParams.seriesIndex].uuid;
+      console.log("clik2", selSerieUuid);
+      const linkPage2 = linkPageMap[selSerieUuid];
+      console.log("clik3", linkPageMap, linkPage2);
+      if (!linkPage2) {
         return;
       }
       doClickJumpPageEvent(props.pageContext, props.configure, void 0);
@@ -84,14 +103,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return;
       }
       hisGroupValue = headerInfo.groupValue;
-      refresh();
+      if (dataConfig) {
+        dataConfig.services[0].groupValue = headerInfo.groupValue;
+      }
+      refresh(false);
     });
     function refresh(isHandle) {
       if (!dataConfig) {
         console.log("无数据源配置，不需要查询!");
         return;
       }
-      dataConfig.services[0].groupValue = headerInfo.groupValue;
       if (isHandle !== true) {
         dataConfig.autoRefresh = true;
       }

package/dist/es/components/runtime/views/assemblys/chart/gauge/gauge-runtime.vue2.js

@@ -41,6 +41,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return;
       }
       hisGroupValue = headerInfo.groupValue;
+      if (dataConfig) {
+        dataConfig.services[0].groupValue = headerInfo.groupValue;
+      }
       refresh();
     });
     function refresh() {
@@ -48,7 +51,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         console.log("无数据源配置，不需要查询!");
         return;
       }
-      dataConfig.services[0].groupValue = headerInfo.groupValue;
       updateChartDatasources(props.pageContext, [dataConfig], headerInfo.drillParams);
     }
     const monitorFields = headerInfo.monitorFields;

package/dist/es/components/runtime/views/assemblys/chart/pie/pie-runtime.vue2.js

@@ -82,14 +82,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return;
       }
       hisGroupValue = headerInfo.groupValue;
-      refresh();
+      if (dataConfig) {
+        dataConfig.services[0].groupValue = headerInfo.groupValue;
+      }
+      refresh(false);
     });
     function refresh(isHandle) {
       if (!dataConfig) {
         console.log("无数据源配置，不需要查询!");
         return;
       }
-      dataConfig.services[0].groupValue = headerInfo.groupValue;
       if (isHandle !== true) {
         dataConfig.autoRefresh = true;
       }

package/dist/es/components/runtime/views/assemblys/chart/radar/radar-runtime.vue2.js

@@ -50,6 +50,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return;
       }
       hisGroupValue = headerInfo.groupValue;
+      if (dataConfig) {
+        dataConfig.services[0].groupValue = headerInfo.groupValue;
+      }
       refresh();
     });
     function refresh() {
@@ -57,7 +60,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         console.log("无数据源配置，不需要查询!");
         return;
       }
-      dataConfig.services[0].groupValue = headerInfo.groupValue;
       updateChartDatasources(props.pageContext, [dataConfig], headerInfo.drillParams);
     }
     const monitorFields = headerInfo.monitorFields;

package/dist/es/components/runtime/views/assemblys/chart/scatter/scatter-runtime.vue2.js

@@ -51,6 +51,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return;
       }
       hisGroupValue = headerInfo.groupValue;
+      if (dataConfig) {
+        dataConfig.services[0].groupValue = headerInfo.groupValue;
+      }
       refresh();
     });
     function refresh() {
@@ -58,7 +61,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         console.log("无数据源配置，不需要查询!");
         return;
       }
-      dataConfig.services[0].groupValue = headerInfo.groupValue;
       updateChartDatasources(props.pageContext, [dataConfig], headerInfo.drillParams);
     }
     const monitorFields = headerInfo.monitorFields;

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, resolveComponent, openBlock, createBlock, normalizeStyle, unref, normalizeClass, withCtx, createElementBlock, Fragment, renderList, createVNode } from "vue";
+import { defineComponent, ref, resolveComponent, openBlock, createBlock, normalizeStyle, unref, normalizeClass, withCtx, createElementBlock, Fragment, renderList, withDirectives, createVNode, vShow } from "vue";
 import _sfc_main$1 from "../../object-render.vue.js";
 import { PageDimensions } from "../../../../utils/interfaces/page-design-types.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -46,7 +46,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }, {
         default: withCtx(() => [
           (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.configure.items, (element, itemIndex) => {
-            return openBlock(), createBlock(_component_el_col, {
+            return withDirectives((openBlock(), createBlock(_component_el_col, {
               key: element.uuid,
               style: normalizeStyle(element.itemStyle),
               span: element.flexSpan
@@ -58,7 +58,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 }, null, 8, ["pageContext", "configure"])
               ]),
               _: 2
-            }, 1032, ["style", "span"]);
+            }, 1032, ["style", "span"])), [
+              [vShow, element._dynamicShowFlag]
+            ]);
           }), 128))
         ]),
         _: 1

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

@@ -196,6 +196,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (!options.operations) {
           options.operations = {};
         }
+        debugger;
         options.operations.operation = operationButtons;
       }
     }

package/dist/es/components/runtime/views/assemblys/form/custom/custom-runtime.vue.js

@@ -0,0 +1,4 @@
+import _sfc_main from "./custom-runtime.vue2.js";
+export {
+  _sfc_main as default
+};

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

@@ -0,0 +1,145 @@
+import { defineComponent, computed, ref, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, resolveDynamicComponent } from "vue";
+import { getFormModelFields } from "../../../../utils/page-init-util.js";
+import { getVariableValue, setVariableValue, getFormPropName, setVariableValueWithProp } from "../../../../utils/page-helper-util.js";
+import "quill";
+import "quill/dist/quill.snow.css";
+import { handleEvent } from "../../../../utils/events/event-util.js";
+import { packageCustomRules } from "../../../../utils/events/validator-util.js";
+import { getListCode } from "../../../../utils/common-util.js";
+import { getComponentRef } from "../../../../utils/global-refs.js";
+import { getAdditionalParamMap } from "../../../../utils/events/standard-event.js";
+const _hoisted_1 = {
+  key: 0,
+  style: { "width": "100%", "height": "100%" }
+};
+const _hoisted_2 = {
+  key: 1,
+  style: { "width": "100%", "height": "100%" },
+  class: "amb-widget-richtext-single"
+};
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "custom-runtime",
+  props: {
+    pageContext: {},
+    configure: {}
+  },
+  setup(__props) {
+    const props = __props;
+    const entity = props.pageContext.entity ? props.pageContext.entity : {};
+    const dynamicFields = getFormModelFields(props.pageContext, props.configure);
+    const dynamicModelMethod = computed({
+      get() {
+        return getVariableValue(entity, dynamicFields);
+      },
+      set(value) {
+        setVariableValue(entity, dynamicFields, value);
+      }
+    });
+    const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
+    const runtimeStyle = runtimeInfo.style;
+    const runtimeClass = runtimeInfo.class;
+    const headerStyle = runtimeInfo.headerStyle;
+    const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
+    const customParams = runtimeInfo.customParams ? runtimeInfo.customParams : {};
+    const additionalParamMap = getAdditionalParamMap(props.pageContext);
+    const componentName = ref(props.configure.props && props.configure.props.base ? props.configure.props.base.name : null);
+    console.log("自定义控件----componentName=", componentName, "designProperty=", designProperty);
+    if (!props.pageContext.customValidatorUuids) {
+      props.pageContext.customValidatorUuids = [];
+    }
+    props.pageContext.customValidatorUuids.push(props.configure.uuid);
+    function customControlSetValue(prop, value) {
+      setVariableValueWithProp(entity, prop, value);
+    }
+    function setCustomvalidateRules(customRules) {
+      if (!customRules) {
+        return;
+      }
+      let rules = props.pageContext.rules ? props.pageContext.rules : {};
+      rules = packageCustomRules(customRules, rules);
+      props.pageContext.rules = rules;
+      let workflowRules = props.pageContext.workflowRules ? props.pageContext.workflowRules : {};
+      workflowRules = packageCustomRules(customRules, workflowRules);
+      props.pageContext.workflowRules = workflowRules;
+    }
+    function restoreGridEdit() {
+      const tableUuids = props.pageContext.tableUuids;
+      if (tableUuids) {
+        tableUuids.forEach((tableUuid) => {
+          const listCode = getListCode(props.pageContext.code, props.pageContext.version, props.configure.uuid);
+          const gridRef = getComponentRef(props.pageContext, tableUuid);
+          if (gridRef) {
+            gridRef.restoreGridEdit(listCode);
+          }
+        });
+      }
+    }
+    return (_ctx, _cache) => {
+      const _component_el_form_item = resolveComponent("el-form-item");
+      return designProperty.value.tittleShow ? (openBlock(), createBlock(_component_el_form_item, {
+        key: 0,
+        required: designProperty.value.required,
+        class: normalizeClass(unref(runtimeClass)),
+        "label-width": designProperty.value.labelWidth,
+        style: normalizeStyle(unref(runtimeStyle))
+      }, {
+        label: withCtx(() => [
+          designProperty.value.tittleShow ? (openBlock(), createElementBlock("div", {
+            key: 0,
+            style: normalizeStyle({ ...unref(headerStyle) })
+          }, toDisplayString(designProperty.value.title), 5)) : createCommentVNode("", true)
+        ]),
+        default: withCtx(() => [
+          componentName.value ? (openBlock(), createElementBlock("div", _hoisted_1, [
+            (openBlock(), createBlock(resolveDynamicComponent(componentName.value), {
+              size: designProperty.value.size,
+              entity: _ctx.pageContext.entity.data,
+              pageData: _ctx.pageContext.entity.page,
+              pageContext: _ctx.pageContext,
+              configureObj: _ctx.configure,
+              prop: unref(getFormPropName)(_ctx.configure.props && _ctx.configure.props.base ? _ctx.configure.props.base.prop : null),
+              "custom-params": unref(customParams),
+              modelValue: dynamicModelMethod.value,
+              "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => dynamicModelMethod.value = $event),
+              disabled: designProperty.value.state === "disabled",
+              "additional-param-map": unref(additionalParamMap),
+              onSetEntityValue: customControlSetValue,
+              onSetCustomRules: setCustomvalidateRules,
+              onRestoreGridEdit: restoreGridEdit,
+              onInput: _cache[1] || (_cache[1] = ($event) => unref(handleEvent)(dynamicModelMethod.value, _ctx.pageContext, _ctx.configure, "input")),
+              onChange: _cache[2] || (_cache[2] = ($event) => unref(handleEvent)(dynamicModelMethod.value, _ctx.pageContext, _ctx.configure, "change")),
+              onClick: _cache[3] || (_cache[3] = ($event) => unref(handleEvent)(dynamicModelMethod.value, _ctx.pageContext, _ctx.configure, "click")),
+              onBlur: _cache[4] || (_cache[4] = ($event) => unref(handleEvent)(dynamicModelMethod.value, _ctx.pageContext, _ctx.configure, "blur")),
+              onFocus: _cache[5] || (_cache[5] = ($event) => unref(handleEvent)(dynamicModelMethod.value, _ctx.pageContext, _ctx.configure, "focus"))
+            }, null, 40, ["size", "entity", "pageData", "pageContext", "configureObj", "prop", "custom-params", "modelValue", "disabled", "additional-param-map"]))
+          ])) : createCommentVNode("", true)
+        ]),
+        _: 1
+      }, 8, ["required", "class", "label-width", "style"])) : componentName.value ? (openBlock(), createElementBlock("div", _hoisted_2, [
+        (openBlock(), createBlock(resolveDynamicComponent(componentName.value), {
+          entity: _ctx.pageContext.entity.data,
+          pageData: _ctx.pageContext.entity.page,
+          pageContext: _ctx.pageContext,
+          configureObj: _ctx.configure,
+          prop: unref(getFormPropName)(_ctx.configure.props && _ctx.configure.props.base ? _ctx.configure.props.base.prop : null),
+          "custom-params": unref(customParams),
+          modelValue: dynamicModelMethod.value,
+          "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => dynamicModelMethod.value = $event),
+          disabled: designProperty.value.state === "disabled",
+          "additional-param-map": unref(additionalParamMap),
+          onSetEntityValue: customControlSetValue,
+          onSetCustomRules: setCustomvalidateRules,
+          onRestoreGridEdit: restoreGridEdit,
+          onInput: _cache[7] || (_cache[7] = ($event) => unref(handleEvent)(dynamicModelMethod.value, _ctx.pageContext, _ctx.configure, "input")),
+          onChange: _cache[8] || (_cache[8] = ($event) => unref(handleEvent)(dynamicModelMethod.value, _ctx.pageContext, _ctx.configure, "change")),
+          onClick: _cache[9] || (_cache[9] = ($event) => unref(handleEvent)(dynamicModelMethod.value, _ctx.pageContext, _ctx.configure, "click")),
+          onBlur: _cache[10] || (_cache[10] = ($event) => unref(handleEvent)(dynamicModelMethod.value, _ctx.pageContext, _ctx.configure, "blur")),
+          onFocus: _cache[11] || (_cache[11] = ($event) => unref(handleEvent)(dynamicModelMethod.value, _ctx.pageContext, _ctx.configure, "focus"))
+        }, null, 40, ["entity", "pageData", "pageContext", "configureObj", "prop", "custom-params", "modelValue", "disabled", "additional-param-map"]))
+      ])) : createCommentVNode("", true);
+    };
+  }
+});
+export {
+  _sfc_main as default
+};

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

@@ -4,6 +4,7 @@ import { getDateShortCuts } from "../../../../utils/form/date-shortcuts.js";
 import { getValueFromVariable, setVariableValue, getVariableValue } from "../../../../utils/page-helper-util.js";
 import { getCustomFunc, handleFormEvent } from "../../../../utils/events/event-util.js";
 import _sfc_main$1 from "../common/title-suffix-element.vue.js";
+import dayjs from "dayjs";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "datepicker-runtime",
   props: {
@@ -19,6 +20,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const headerStyle = runtimeInfo.headerStyle;
     const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
     let dynamicFields = getFormModelFields(props.pageContext, props.configure);
+    console.log("designProperty", designProperty);
     let dynamicFields2 = null;
     let isRange = false;
     if (designProperty.value.dateType && designProperty.value.dateType.includes("range")) {
@@ -36,15 +38,57 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       }
     }
+    function formatDate(value, formatStr) {
+      if (!value) {
+        return value;
+      }
+      if (formatStr) {
+        console.log("formatStr", formatStr);
+        console.log("before", value);
+        try {
+          const convertValue = dayjs(value);
+          let value2 = null;
+          if (formatStr === "x") {
+            value2 = convertValue.toDate().getTime();
+          } else {
+            value2 = dayjs(value).format(formatStr);
+          }
+          console.log("after", value2);
+          return value2;
+        } catch (e) {
+          console.error("日期值格式化错误", e);
+          console.error(`value: ${value} ,valueFormat: ${designProperty.value.valueFormat}`);
+          return value;
+        }
+      }
+      return value;
+    }
+    if (dynamicFields) {
+      const hisValue = getVariableValue(entity, dynamicFields);
+      const newValue = formatDate(hisValue, designProperty.value.valueFormat);
+      if (hisValue !== newValue) {
+        setVariableValue(entity, dynamicFields, newValue);
+      }
+    }
+    if (dynamicFields2) {
+      const hisValue = getVariableValue(entity, dynamicFields2);
+      const newValue = formatDate(hisValue, designProperty.value.valueFormat);
+      if (hisValue !== newValue) {
+        setVariableValue(entity, dynamicFields2, newValue);
+      }
+    }
     const dynamicModelMethod = computed({
       get() {
         if (isRange) {
           const values = [];
-          values.push(getVariableValue(entity, dynamicFields));
-          values.push(getVariableValue(entity, dynamicFields2));
+          let value1 = getVariableValue(entity, dynamicFields);
+          values.push(value1);
+          let value2 = getVariableValue(entity, dynamicFields2);
+          values.push(value2);
           return values;
         } else {
-          return getVariableValue(entity, dynamicFields);
+          let value1 = getVariableValue(entity, dynamicFields);
+          return value1;
         }
       },
       set(value) {
@@ -59,7 +103,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         } else {
           setVariableValue(entity, dynamicFields, value);
         }
-        console.log("entity", entity);
       }
     });
     const shortcuts = ref(
@@ -131,7 +174,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             "start-placeholder": designProperty.value.placeholder,
             "end-placeholder": designProperty.value.endPlaceholder ? designProperty.value.endPlaceholder : designProperty.value.placeholder,
             format: designProperty.value.format,
-            "value-format": designProperty.value.valueFormat ? designProperty.value.valueFormat : "x",
+            "value-format": designProperty.value.valueFormat,
             modelValue: dynamicModelMethod.value,
             "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => dynamicModelMethod.value = $event),
             shortcuts: shortcuts.value,
@@ -153,18 +196,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             "start-placeholder": designProperty.value.placeholder,
             "end-placeholder": designProperty.value.endPlaceholder ? designProperty.value.endPlaceholder : designProperty.value.placeholder,
             format: designProperty.value.format,
+            "value-format": designProperty.value.valueFormat,
             modelValue: dynamicModelMethod.value,
             "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => dynamicModelMethod.value = $event),
             shortcuts: shortcuts.value,
             type: designProperty.value.dateType,
-            "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"]))
+          }, null, 8, ["clearable", "disabled", "readonly", "size", "placeholder", "start-placeholder", "end-placeholder", "format", "value-format", "modelValue", "shortcuts", "type"]))
         ]),
         _: 1
       }, 8, ["required", "class", "label-width", "style"]);

package/dist/es/components/runtime/views/assemblys/form/placeholder/placeholder-runtime.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./placeholder-runtime.vue2.js";
-/* empty css                         */
+import "./placeholder-runtime.vue3.js";
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
 const placeholderRuntime = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a0860ff0"]]);
 export {

package/dist/es/components/runtime/views/assemblys/form/placeholder/placeholder-runtime.vue3.js

@@ -0,0 +1 @@
+

package/dist/es/components/runtime/views/assemblys/object-render.vue.js

@@ -19,6 +19,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       props.configure.style = {};
     }
     const permissionCodes = getPermissionCodes(props.configure, props.pageContext);
+    console.log("Object-Render---permissionCodes=", permissionCodes);
     if (props.configure && props.configure.props && props.configure.props.base) {
       props.configure.props.base.functionCode = permissionCodes;
     }
@@ -36,15 +37,24 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       showFlag = computed(() => {
         var _a2;
+        let dynamicShowFlag = true;
         if (!handleShowFlag.value) {
-          return false;
-        }
-        const state = (_a2 = props.configure.props.base) == null ? void 0 : _a2.state;
-        if (state && state === "hidden") {
-          return false;
+          dynamicShowFlag = false;
+        } else {
+          if (showConditions && showConditions.length > 0) {
+            dynamicShowFlag = caculateShowCondition(props.pageContext, props.configure, showConditions);
+          } else {
+            const state = (_a2 = props.configure.props.base) == null ? void 0 : _a2.state;
+            if (state && state === "hidden") {
+              dynamicShowFlag = false;
+            }
+          }
         }
-        return caculateShowCondition(props.pageContext, props.configure, showConditions);
+        console.log("obj-render-dynamicShowFlag", dynamicShowFlag);
+        return dynamicShowFlag;
       });
+      const propConfigure = props.configure;
+      propConfigure._dynamicShowFlag = showFlag;
       if (props.configure.props.editConditions) {
         const editConditions = props.configure.props.editConditions;
         if (editConditions.length > 0) {
@@ -92,12 +102,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       thisRef.value = el;
       if (el && !el.show) {
         el.show = function() {
-          showFlag.value = true;
+          handleShowFlag.value = true;
         };
       }
       if (el && !el.hide) {
         el.hide = function() {
-          showFlag.value = false;
+          handleShowFlag.value = false;
         };
       }
       if (el && !el.getConfigure) {

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

@@ -127,7 +127,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       setTimeout(() => {
         console.log("pageDesign.initChartServiceConfigs", pageDesign.initChartServiceConfigs);
         initChartDatas(pageContext.value, pageDesign.initChartServiceConfigs);
-      }, 0);
+      }, 200);
       pageContext.value.initDataSources = [];
       initComponentRefState(pageContext.value);
       pageItems.value = pageContext.value.items ? pageContext.value.items : [];
@@ -225,7 +225,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function initChartDatas(pageContext2, chartConfigs) {
       if (!chartConfigs || chartConfigs.length == 0) {
-        console.log("无需要初始化的选项组数据");
+        console.log("无需要初始化时统计的统计图数据");
         return;
       }
       pageContext2.initChartData = {};
@@ -349,7 +349,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (!_selectFile_.value) {
           return;
         }
-        if (_selectFile_.value.value === "" || _selectFile_.value.value === null) return;
+        if (_selectFile_.value.value === "" || _selectFile_.value.value === null)
+          return;
         const fileObj = _selectFile_.value.files[0];
         if (fileObj) {
           _selectFile_.value.value = null;
@@ -397,14 +398,25 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             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 selections = eventParams ? eventParams.selections : [];
+            console.log(
+              "getPopPageSetting---selections=",
+              selections,
+              "parentPageContext.value=",
+              parentPageContext.value
+            );
             let entity = {};
-            if (pageModel) {
-              Object.assign(entity, pageModel);
-            }
-            if (dataModel) {
-              Object.assign(entity, dataModel);
+            if (selections && selections.length > 0) {
+              entity = selections[0];
+            } else {
+              const dataModel = parentPageContext.value.entity.data;
+              const pageModel = parentPageContext.value.entity.page;
+              if (pageModel) {
+                Object.assign(entity, pageModel);
+              }
+              if (dataModel) {
+                Object.assign(entity, dataModel);
+              }
             }
             jumpToPage(myJumpPageSetting, null, dataId, entity, additionalParamMap, ids).then(
               (openPageParams) => {

package/package.json

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