super-page-designer 2.1.74 → 2.1.78

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

@@ -557,6 +557,7 @@ const assemblyGroups = [
         },
         style: { titleFont: {}, background: {}, margin: {}, padding: {}, border: {}, shadow: {} },
         events: [
+          { name: "afterInit", label: "初始化后", tip: "初始化后" },
           { name: "change", label: "更改", tip: "更改" },
           { name: "show", label: "显示", tip: "显示元素时执行" },
           { name: "hidden", label: "隐藏", tip: "隐藏元素时执行" }
@@ -598,6 +599,7 @@ const assemblyGroups = [
         },
         style: { titleFont: {}, background: {}, margin: {}, padding: {}, border: {}, shadow: {} },
         events: [
+          { name: "afterInit", label: "初始化后", tip: "初始化后" },
           { name: "change", label: "更改", tip: "更改" },
           { name: "show", label: "显示", tip: "显示元素时执行" },
           { name: "hidden", label: "隐藏", tip: "隐藏元素时执行" }

package/dist/es/components/design/utils/form-design-util.js

@@ -452,6 +452,8 @@ function packageRuleByDataType(fieldInfo, rule) {
     if (!rule.pattern) {
       rule.pattern = new RegExp("^(-?\\d+)(\\.\\d+)?$");
     }
+  } else if (dataType === "BOOLEAN") {
+    rule.type = "boolean";
   }
   rule.trigger = "blur";
 }

package/dist/es/components/design/utils/page-table-util.d.ts

@@ -38,3 +38,4 @@ export declare function tableResetConfigIndo(configure: object, moduleValue: any
 export declare function changeFeieldToMap(modelFieldsMap: any, tableFields: any): any;
 export declare function getTableNameByTableUuid(pageDesign: any, tableUuid: any): any;
 export declare function getModelOptionsByFields(dataFieldList: any): any;
+export declare function getTableConfigByTableUuid(pageDesign: any, configure: any): any;

package/dist/es/components/design/utils/page-table-util.js

@@ -2,6 +2,7 @@ import http from "agilebuilder-ui/src/utils/request";
 import { getFormPropName } from "./page-helper-util.js";
 import { getDesignEvents } from "./assemblys-config.js";
 import { addI18nKey } from "./page-i18n-util.js";
+import { findDesignItemByUuid } from "./common-util.js";
 function queryTableFields(systemCode, systemVersion, tableName) {
   let url = window["$vueApp"].config.globalProperties.baseAPI + "/mms/data-tables/table-columns";
   url += "?systemCode=" + (systemCode ? systemCode : "");
@@ -572,9 +573,26 @@ function getModelOptionsByFields(dataFieldList) {
   }
   return dataModelOptions;
 }
+function getTableConfigByTableUuid(pageDesign, configure) {
+  var _a;
+  const pageType = pageDesign ? pageDesign.pageType : null;
+  let tableConfig;
+  let tableUuid;
+  if (configure == null ? void 0 : configure.props.base.tableUuid) {
+    tableUuid = configure.props.base.tableUuid;
+    tableConfig = findDesignItemByUuid(pageDesign, tableUuid);
+  } else if (pageType && pageType === "list" && ((_a = pageDesign == null ? void 0 : pageDesign.tableUuids) == null ? void 0 : _a.length) > 0) {
+    tableUuid = pageDesign == null ? void 0 : pageDesign.tableUuids[0];
+    tableConfig = findDesignItemByUuid(pageDesign, tableUuid);
+  } else if (pageDesign == null ? void 0 : pageDesign.currentTableConfig) {
+    tableConfig = pageDesign.currentTableConfig;
+  }
+  return tableConfig;
+}
 export {
   changeFeieldToMap,
   getModelOptionsByFields,
+  getTableConfigByTableUuid,
   getTableNameByTableUuid,
   querySublist,
   queryTableFields,

package/dist/es/components/design/views/assemblys/button/button/button-attr-base.vue.js

@@ -1,13 +1,19 @@
-import { defineComponent, ref, onMounted, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createTextVNode, withDirectives, vShow } from "vue";
+import { defineComponent, ref, onMounted, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createTextVNode, withDirectives, vShow, createCommentVNode } from "vue";
 import { getFormComponentOptions } from "../../../../utils/assemblys-config.js";
 import "../../../../../../stores/page-store.js";
 import "../../form/common/dimension-input.vue.js";
 import _sfc_main$3 from "../../common/common-icon-bind.vue.js";
 import http from "agilebuilder-ui/src/utils/request";
 import _sfc_main$1 from "../../common/common-function-code.vue.js";
-import _sfc_main$4 from "../../form/common/suffixmodule.vue.js";
+import "@element-plus/icons";
+import "@element-plus/icons-vue";
+import "uuid";
+import "../../../../../../stores/table-store.js";
+import "../../../../../../stores/statistics-table-store.js";
+import "../../common/common-variable-bind.vue3.js";
+import { getTableConfigByTableUuid } from "../../../../utils/page-table-util.js";
 import _sfc_main$2 from "../../common/common-i18n-key-input.vue.js";
-import { findDesignItemByUuid } from "../../../../utils/common-util.js";
+import _sfc_main$4 from "../../chart/statistical-table/component/link-table.vue.js";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_2 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_3 = { style: { "padding": "8px 0px 0px 0px" } };
@@ -29,7 +35,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const openCollapseItems = ref(["base", "appearance", "otherSettings", "linkPage"]);
     const templateList = ref({});
     const templateFileUuids = ref([]);
-    const tableConfigure = ref(getTableConfigByTableUuid());
+    const myTableConfigure = ref(getMyTableConfigByTableUuid());
+    const isShowLink = ref(false);
     if (props.configure.props.base.templateFiles) {
       props.configure.props.base.templateFiles.forEach((templateFile) => {
         templateFileUuids.value.push(templateFile.templateUuid);
@@ -38,12 +45,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     if (props.configure.props.base.isEnableRequired === void 0) {
       props.configure.props.base.isEnableRequired = true;
     }
+    if (props.configure.props.linkPage && !(props.configure.props.linkPage instanceof Array)) {
+      props.configure.props.linkPage = [{ linkPage: props.configure.props.linkPage }];
+      isShowLink.value = true;
+    } else {
+      isShowLink.value = true;
+    }
     const tableList = ref([]);
     function getTableList() {
-      if (props.pageDesign.items && props.pageDesign.items.length > 0) {
-        tableList.value = props.pageDesign.items.filter((item) => {
-          return item.label === "表格";
-        });
+      if (props.pageDesign.tableUuids && props.pageDesign.tableUuids.length > 0) {
+        tableList.value = props.pageDesign.tableUuids;
       }
     }
     function queryTemplateList() {
@@ -81,21 +92,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         props.configure.props.base.templateFiles = [];
       }
     }
-    function getTableConfigByTableUuid() {
-      var _a, _b, _c;
-      let tableUuid;
-      if (props.configure.props.base.tableUuid) {
-        tableUuid = props.configure.props.base.tableUuid;
-      } else if (((_b = (_a = props.pageDesign) == null ? void 0 : _a.tableUuids) == null ? void 0 : _b.length) > 0) {
-        tableUuid = (_c = props.pageDesign) == null ? void 0 : _c.tableUuids[0];
-      }
-      if (tableUuid) {
-        return findDesignItemByUuid(props.pageDesign, tableUuid);
-      }
+    function getMyTableConfigByTableUuid() {
+      return getTableConfigByTableUuid(props.pageDesign, props.configure);
     }
     function changeTableConfig(tableUuid) {
-      const tableConfig = getTableConfigByTableUuid();
-      tableConfigure.value = tableConfig;
+      const tableConfig = getMyTableConfigByTableUuid();
+      myTableConfigure.value = tableConfig;
+    }
+    function linkChange(data) {
+      props.configure.props.linkPage = data;
     }
     return (_ctx, _cache) => {
       const _component_el_option = resolveComponent("el-option");
@@ -116,7 +121,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         default: withCtx(() => [
           createVNode(_component_el_collapse, {
             modelValue: openCollapseItems.value,
-            "onUpdate:modelValue": _cache[23] || (_cache[23] = ($event) => openCollapseItems.value = $event),
+            "onUpdate:modelValue": _cache[24] || (_cache[24] = ($event) => openCollapseItems.value = $event),
             style: { "margin-top": "6px" }
           }, {
             default: withCtx(() => [
@@ -551,12 +556,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               }, {
                 default: withCtx(() => [
                   createElementVNode("div", _hoisted_3, [
-                    (openBlock(), createBlock(_sfc_main$4, {
-                      key: __props.configure.uuid,
-                      configure: __props.configure,
+                    isShowLink.value ? (openBlock(), createBlock(_sfc_main$4, {
+                      key: 0,
                       pageDesign: __props.pageDesign,
-                      tableConfigure: tableConfigure.value
-                    }, null, 8, ["configure", "pageDesign", "tableConfigure"]))
+                      paramTypes: ["data", "task", "page", "request", "row"],
+                      data: __props.configure.props.linkPage,
+                      configure: __props.configure,
+                      tableConfigure: myTableConfigure.value,
+                      onDataChange: _cache[15] || (_cache[15] = (data) => linkChange(data))
+                    }, null, 8, ["pageDesign", "data", "configure", "tableConfigure"])) : createCommentVNode("", true)
                   ])
                 ]),
                 _: 1
@@ -575,7 +583,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_switch, {
                           modelValue: __props.configure.props.base.isNeedValueMapping,
-                          "onUpdate:modelValue": _cache[15] || (_cache[15] = ($event) => __props.configure.props.base.isNeedValueMapping = $event),
+                          "onUpdate:modelValue": _cache[16] || (_cache[16] = ($event) => __props.configure.props.base.isNeedValueMapping = $event),
                           size: "default"
                         }, null, 8, ["modelValue"])
                       ]),
@@ -588,7 +596,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_switch, {
                           modelValue: __props.configure.props.base.isPermission,
-                          "onUpdate:modelValue": _cache[16] || (_cache[16] = ($event) => __props.configure.props.base.isPermission = $event),
+                          "onUpdate:modelValue": _cache[17] || (_cache[17] = ($event) => __props.configure.props.base.isPermission = $event),
                           size: "default"
                         }, null, 8, ["modelValue"])
                       ]),
@@ -601,7 +609,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_switch, {
                           modelValue: __props.configure.props.base.isAsync,
-                          "onUpdate:modelValue": _cache[17] || (_cache[17] = ($event) => __props.configure.props.base.isAsync = $event),
+                          "onUpdate:modelValue": _cache[18] || (_cache[18] = ($event) => __props.configure.props.base.isAsync = $event),
                           size: "default"
                         }, null, 8, ["modelValue"])
                       ]),
@@ -614,7 +622,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_switch, {
                           modelValue: __props.configure.props.base.isEnableRequired,
-                          "onUpdate:modelValue": _cache[18] || (_cache[18] = ($event) => __props.configure.props.base.isEnableRequired = $event),
+                          "onUpdate:modelValue": _cache[19] || (_cache[19] = ($event) => __props.configure.props.base.isEnableRequired = $event),
                           size: "default"
                         }, null, 8, ["modelValue"])
                       ]),
@@ -627,7 +635,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_switch, {
                           modelValue: __props.configure.props.base.isSafeDelete,
-                          "onUpdate:modelValue": _cache[19] || (_cache[19] = ($event) => __props.configure.props.base.isSafeDelete = $event),
+                          "onUpdate:modelValue": _cache[20] || (_cache[20] = ($event) => __props.configure.props.base.isSafeDelete = $event),
                           size: "default"
                         }, null, 8, ["modelValue"])
                       ]),
@@ -640,7 +648,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_select, {
                           modelValue: templateFileUuids.value,
-                          "onUpdate:modelValue": _cache[20] || (_cache[20] = ($event) => templateFileUuids.value = $event),
+                          "onUpdate:modelValue": _cache[21] || (_cache[21] = ($event) => templateFileUuids.value = $event),
                           filterable: "",
                           multiple: "",
                           onChange: templateFilesChange
@@ -666,7 +674,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_select, {
                           modelValue: __props.configure.props.base.conditionsForExecution,
-                          "onUpdate:modelValue": _cache[21] || (_cache[21] = ($event) => __props.configure.props.base.conditionsForExecution = $event)
+                          "onUpdate:modelValue": _cache[22] || (_cache[22] = ($event) => __props.configure.props.base.conditionsForExecution = $event)
                         }, {
                           default: withCtx(() => [
                             createVNode(_component_el_option, {
@@ -694,17 +702,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_select, {
                           modelValue: __props.configure.props.base.tableUuid,
-                          "onUpdate:modelValue": _cache[22] || (_cache[22] = ($event) => __props.configure.props.base.tableUuid = $event),
+                          "onUpdate:modelValue": _cache[23] || (_cache[23] = ($event) => __props.configure.props.base.tableUuid = $event),
                           clearable: "",
                           filterable: "",
+                          "allow-create": "",
                           onChange: changeTableConfig
                         }, {
                           default: withCtx(() => [
-                            (openBlock(true), createElementBlock(Fragment, null, renderList(tableList.value, (item) => {
+                            (openBlock(true), createElementBlock(Fragment, null, renderList(tableList.value, (tableuuid) => {
                               return openBlock(), createBlock(_component_el_option, {
-                                key: item.uuid,
-                                label: item.title,
-                                value: item.uuid
+                                key: tableuuid,
+                                label: tableuuid,
+                                value: tableuuid
                               }, null, 8, ["label", "value"]);
                             }), 128))
                           ]),

package/dist/es/components/design/views/assemblys/chart/statistical-table/component/link-table.vue.js

@@ -1,7 +1,9 @@
-import { defineComponent, ref, watch, resolveComponent, openBlock, createElementBlock, Fragment, createVNode, withCtx, renderList, unref, createBlock, createTextVNode } from "vue";
+import { defineComponent, ref, watch, resolveComponent, openBlock, createElementBlock, Fragment, createVNode, withCtx, renderList, unref, createBlock, createTextVNode, createCommentVNode } from "vue";
 import _sfc_main$1 from "./table-showcondition.vue.js";
 import _sfc_main$2 from "../../../form/common/suffixmodule.vue.js";
 import { getCustomFuncs } from "../../../../../utils/page-event-util.js";
+import "uuid";
+import { getTableConfigByTableUuid } from "../../../../../utils/page-table-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "link-table",
   props: {
@@ -19,6 +21,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     paramTypes: {
       type: Array,
       default: () => ["data", "task", "page", "request"]
+    },
+    // 比如按钮的配置
+    configure: {
+      type: Object,
+      default: () => {
+        return null;
+      }
+    },
+    // 表格的配置
+    tableConfigure: {
+      type: Object,
+      default: () => {
+        return null;
+      }
     }
   },
   emits: ["dataChange"],
@@ -30,6 +46,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       tableData.value = props.data;
     }
     const dialogTableVisible = ref(false);
+    const myTableConfigure = ref(props.tableConfigure);
     if (!tableData.value || tableData.value.length == 0) {
       tableData.value.push({
         showCondition: [],
@@ -42,7 +59,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       tableData.value.splice(index + 1, 0, {
         showCondition: [],
         eventCallBack: "",
-        style: {}
+        style: {},
+        linkPage: {}
       });
     }
     function deleteData(rowItem, index) {
@@ -55,7 +73,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     const linkData = ref({});
     const linkIndex = ref(0);
+    function getMyTableConfigByTableUuid() {
+      return getTableConfigByTableUuid(props.pageDesign, props.configure);
+    }
     function linkConfig(data, index) {
+      myTableConfigure.value = getMyTableConfigByTableUuid();
       linkData.value = data;
       dialogTableVisible.value = true;
       linkIndex.value = index;
@@ -105,8 +127,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   data: scope.row.showCondition,
                   pageDesign: __props.pageDesign,
                   row: scope.row,
+                  tableConfigure: myTableConfigure.value,
+                  configure: __props.configure,
                   "onUpdate:data": updateTableShowCondition
-                }, null, 8, ["paramTypes", "data", "pageDesign", "row"])
+                }, null, 8, ["paramTypes", "data", "pageDesign", "row", "tableConfigure", "configure"])
               ]),
               _: 1
             }),
@@ -187,7 +211,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ]),
           _: 1
         }, 8, ["data"]),
-        createVNode(_component_el_dialog, {
+        dialogTableVisible.value ? (openBlock(), createBlock(_component_el_dialog, {
+          key: 0,
           modelValue: dialogTableVisible.value,
           "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => dialogTableVisible.value = $event),
           title: "超链接设置",
@@ -199,11 +224,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             createVNode(_sfc_main$2, {
               isDialog: true,
               configure: linkData.value,
-              pageDesign: __props.pageDesign
-            }, null, 8, ["configure", "pageDesign"])
+              pageDesign: __props.pageDesign,
+              tableConfigure: myTableConfigure.value
+            }, null, 8, ["configure", "pageDesign", "tableConfigure"])
           ]),
           _: 1
-        }, 8, ["modelValue"])
+        }, 8, ["modelValue"])) : createCommentVNode("", true)
       ], 64);
     };
   }

package/dist/es/components/design/views/assemblys/chart/statistical-table/component/style-table.vue.js

@@ -104,9 +104,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 row: scope.row,
                 data: scope.row.matchingCondition,
                 pageDesign: __props.pageDesign,
-                configure: __props.configure,
+                tableConfigure: __props.configure,
                 "onUpdate:data": updateTableShowCondition
-              }, null, 8, ["paramTypes", "row", "data", "pageDesign", "configure"])
+              }, null, 8, ["paramTypes", "row", "data", "pageDesign", "tableConfigure"])
             ]),
             _: 1
           })) : createCommentVNode("", true),

package/dist/es/components/design/views/assemblys/chart/statistical-table/component/table-showcondition.vue.js

@@ -4,7 +4,7 @@ import BindVariable from "../../../common/common-variable-bind.vue.js";
 import { getUuidv4 } from "../../../../../utils/common-util.js";
 import { usePageContextStore } from "../../../../../../../stores/page-store.js";
 import { statisticsTable } from "../../../../../../../stores/statistics-table-store.js";
-import { getModelOptionsByFields } from "../../../../../utils/page-table-util.js";
+import { getModelOptionsByFields, getTableConfigByTableUuid } from "../../../../../utils/page-table-util.js";
 const _hoisted_1 = { style: { "text-align": "center", "margin": "0px -8px", "padding-top": "4px", "padding-left": "2px" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "table-showcondition",
@@ -22,11 +22,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       type: Array,
       default: () => ["data", "task", "page", "request", "row"]
     },
+    // 当前选择的组件配置，例如按钮的配置
     configure: {
       type: Object,
       default: () => {
       }
     },
+    // 表格配置
+    tableConfigure: {
+      type: Object,
+      default: () => {
+      }
+    },
     // 页面信息
     pageDesign: {
       type: Object,
@@ -62,10 +69,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       dataModelOptions.value = getModelOptionsByFields(dataFieldNameList);
     }
     const rowModelOptions = ref(null);
-    if (props.configure) {
-      rowModelOptions.value = getModelOptionsByFields(props.configure.modelFields);
+    updateRowModelOptions(props.tableConfigure);
+    function getMyTableConfigByTableUuid() {
+      return getTableConfigByTableUuid(props.pageDesign, props.configure);
+    }
+    function updateRowModelOptions(tableConfigure) {
+      if (tableConfigure) {
+        rowModelOptions.value = getModelOptionsByFields(tableConfigure.modelFields);
+      }
     }
     function openDialog() {
+      updateRowModelOptions(getMyTableConfigByTableUuid());
       let tempHeight = window.innerHeight - 140 - 176;
       if (tempHeight > 500) {
         tempHeight = 500;

package/dist/es/components/design/views/assemblys/chart/statistical-table/statisticalTable-attr-base.vue.js

@@ -1,20 +1,21 @@
 import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createTextVNode, createCommentVNode, toDisplayString } from "vue";
 import { getFormComponentOptions, getStatisticsTableColumn } from "../../../../utils/assemblys-config.js";
 import DataOrigin from "./component/data-origin.vue.js";
-import _sfc_main$4 from "./component/style-table.vue.js";
-import _sfc_main$5 from "./component/link-table.vue.js";
-import _sfc_main$6 from "./component/table-pageination.vue.js";
-import _sfc_main$7 from "../../common/common-attr-size.vue.js";
+import _sfc_main$5 from "./component/style-table.vue.js";
+import _sfc_main$6 from "./component/link-table.vue.js";
+import _sfc_main$7 from "./component/table-pageination.vue.js";
+import _sfc_main$8 from "../../common/common-attr-size.vue.js";
 import _sfc_main$2 from "../../form/common/data-linkage.vue.js";
 import { getUuidv4 } from "../../../../utils/common-util.js";
 import { addColumnToGroupHeaders, getColumnsWithGroupHeader } from "../../../../utils/data-table-util.js";
 import "agilebuilder-ui/src/utils/request";
 import _sfc_main$1 from "../../common/common-function-code.vue.js";
-import _sfc_main$3 from "../../data/component/formatting-icon-label.vue.js";
+import _sfc_main$4 from "../../data/component/formatting-icon-label.vue.js";
 import { getCustomFuncs } from "../../../../utils/page-event-util.js";
 import eventBus from "../../../../utils/eventBus.js";
 import { InfoFilled } from "@element-plus/icons-vue";
 import { statisticsTable } from "../../../../../../stores/statistics-table-store.js";
+import _sfc_main$3 from "./component/table-showcondition.vue.js";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_2 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_3 = { style: { "float": "left" } };
@@ -202,6 +203,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         };
       }
     }
+    function updateTableShowCondition(params) {
+      debugger;
+      if (params.row) {
+        params.row.showCondition = params.data;
+      }
+    }
     return (_ctx, _cache) => {
       const _component_el_option = resolveComponent("el-option");
       const _component_el_select = resolveComponent("el-select");
@@ -384,6 +391,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                           width: "35"
                         }, {
                           default: withCtx((props2) => [
+                            createVNode(_component_el_form_item, { class: "amb-design-attr-item" }, {
+                              label: withCtx(() => [
+                                createTextVNode(" 显示条件 ")
+                              ]),
+                              default: withCtx(() => [
+                                createVNode(_sfc_main$3, {
+                                  paramTypes: ["data", "task", "page", "request"],
+                                  data: props2.row.showCondition,
+                                  pageDesign: __props.pageDesign,
+                                  configure: __props.configure,
+                                  row: props2.row,
+                                  "onUpdate:data": updateTableShowCondition
+                                }, null, 8, ["data", "pageDesign", "configure", "row"])
+                              ]),
+                              _: 2
+                            }, 1024),
                             createVNode(_component_el_form_item, {
                               class: "amb-design-attr-item",
                               "label-position": "top"
@@ -557,7 +580,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                               ]),
                               _: 2
                             }, 1024)) : createCommentVNode("", true),
-                            props2.row.props.format && props2.row.props.format.type === "icon" ? (openBlock(), createBlock(_sfc_main$3, {
+                            props2.row.props.format && props2.row.props.format.type === "icon" ? (openBlock(), createBlock(_sfc_main$4, {
                               key: 7,
                               setting: props2.row.props.format,
                               "show-event": false
@@ -1102,7 +1125,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                               ]),
                               _: 1
                             }),
-                            createVNode(_sfc_main$4, {
+                            createVNode(_sfc_main$5, {
                               configure: __props.configure,
                               showCondition: true,
                               paramTypes: ["data", "task", "page", "request", "row"],
@@ -1115,7 +1138,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                               ]),
                               _: 1
                             }),
-                            createVNode(_sfc_main$5, {
+                            createVNode(_sfc_main$6, {
                               pageDesign: __props.pageDesign,
                               paramTypes: ["data", "task", "page", "request", "row"],
                               data: props2.row.linkPage,
@@ -1243,7 +1266,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               }),
-              createVNode(_sfc_main$6, {
+              createVNode(_sfc_main$7, {
                 configure: __props.configure,
                 pageDesign: __props.pageDesign,
                 serviceFields: selectedServiceResultFields.value
@@ -1346,7 +1369,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               }),
-              createVNode(_sfc_main$7, {
+              createVNode(_sfc_main$8, {
                 size: __props.configure.props.size,
                 showMaxHeight: true,
                 showCalcHeight: true

package/dist/es/components/design/views/assemblys/chart/statistical-table/statisticalTable-design.vue2.js

@@ -11,6 +11,7 @@ import "@element-plus/icons";
 import "agilebuilder-ui/src/utils/auth";
 import "super-page-runtime";
 import "../../../../../../stores/page-store.js";
+import "@vueuse/core";
 import _sfc_main$1 from "../../data/component/table-children-column.vue.js";
 import { queryTableFields, changeFeieldToMap } from "../../../../utils/page-table-util.js";
 import { removComponentDataConfig, initComponentDataConfig } from "../../../../utils/chart-design-util.js";

package/dist/es/components/design/views/assemblys/common/common-advanced-basic-showcondition.vue.js

@@ -22,7 +22,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
   },
   setup(__props) {
-    const pageDesignUtil = usePageContextStore();
+    const pageDesignContextUtil = usePageContextStore();
     const props = __props;
     if (!props.configure.props) {
       props.configure.props = { base: {} };
@@ -114,7 +114,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ;
           else if (propName.startsWith("data.")) {
             propName = propName.substring(5);
-            dataType = pageDesignUtil.getModelField(propName);
+            const column = pageDesignContextUtil.getModelField(propName);
+            dataType = column ? column.dataType : null;
           }
         }
         rowObj.dataType = dataType;

package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue.js

@@ -1,5 +1,5 @@
-import _sfc_main from "./common-variable-bind.vue3.js";
-import "./common-variable-bind.vue2.js";
+import _sfc_main from "./common-variable-bind.vue2.js";
+import "./common-variable-bind.vue3.js";
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
 const BindVariable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-3528c938"]]);
 export {