super-page-runtime 2.1.50 → 2.1.57

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

@@ -1,10 +1,11 @@
-import { defineComponent, ref, onMounted, resolveComponent, openBlock, createElementBlock, normalizeStyle, unref, normalizeClass, withDirectives, createVNode, vShow, withCtx, Fragment, renderList, createBlock, watch, h } from "vue";
+import { defineComponent, ref, onMounted, watch, resolveComponent, openBlock, createElementBlock, normalizeStyle, unref, normalizeClass, withDirectives, createVNode, vShow, withCtx, Fragment, renderList, createBlock, createCommentVNode, h } from "vue";
 import _sfc_main$1 from "../common/common-chart-header.vue.js";
-import { getChartDatasFromPage, isPromise, getValueFromVariable } from "../../../../utils/page-helper-util.js";
+import { getChartDatasFromPage, getValueFromVariable, isPromise, setValueForVariableName, updateChartDatasourcesByComponent } from "../../../../utils/page-helper-util.js";
 import { getCustomFunc } from "../../../../utils/events/event-util.js";
 import _sfc_main$2 from "./group-column.vue.js";
 import _sfc_main$3 from "./normal-column.vue.js";
-import { getSummaryTitleColumn, getSummaryDataColumn, rowDataToColumn, getColumnToRowTableConfig, colDataToRow, summaryStatistics, replacePlaceholders, getHeaderCellStyleUtil, getRowStyleUtil, getCellStyleUtil, getIndexColumn } from "./chart-table-util.js";
+import _sfc_main$4 from "./table-pageination.vue.js";
+import { getSummaryTitleColumn, getSummaryDataColumn, rowDataToColumn, getColumnToRowTableConfig, colDataToRow, computeFormula, summaryStatistics, replacePlaceholders, getHeaderCellStyleUtil, getRowStyleUtil, getCellStyleUtil, getIndexColumn } from "./chart-table-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "table-runtime",
   props: {
@@ -41,6 +42,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const groupSummaryColumns = ref({});
     const groupSummaryDataRowIndex = [];
     const columnStyleSourceConfig = ref({});
+    const dataFormulaMapping = ref({});
+    const total = ref(0);
+    let tmpTableData = [];
     if (!props.configure.props.modelCustom) {
       if (!isEnableGroupHeader.value) {
         tableColumnsConfig.value = props.configure.items;
@@ -50,7 +54,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       (_a = props.configure.items) == null ? void 0 : _a.forEach((item) => {
         columnsConfigKeyValues.value[item.uuid] = item;
         if (Object.keys(item.style).length > 0) {
-          columnStyleSourceConfig.value[item.props.base.prop] = { cellStyle: item.style, titleStyle: item.titleStyle };
+          columnStyleSourceConfig.value[item.props.base.prop] = {
+            cellStyle: item.style,
+            titleStyle: item.titleStyle
+          };
+        }
+        if (item.formula && item.formula.trim() !== "") {
+          dataFormulaMapping.value[item.props.base.prop] = item.formula;
         }
       });
     }
@@ -68,6 +78,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const resultData = getChartDatasFromPage(props.pageContext, props.configure);
       if (resultData) {
         updateChartDatas(resultData);
+      } else {
+        if (props.configure.props.dataOrigin.dataSource === "variable") {
+          watchVariableDataChange();
+          const tmpTableData2 = getValueFromVariable(
+            props.pageContext.entity,
+            props.configure.props.dataOrigin.variable
+          );
+          if (tmpTableData2) {
+            loadTable(tmpTableData2, resultData);
+          }
+        }
       }
     });
     function watchVariableDataChange() {
@@ -76,7 +97,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       watch(
         () => path.reduce((obj, key) => obj[key], props.pageContext.entity),
         (newVal) => {
-          loadTable(JSON.parse(JSON.stringify(newVal)));
+          loadTable(JSON.parse(JSON.stringify(newVal)), null);
         }
       );
     }
@@ -117,7 +138,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }
         }
       }
-      let tmpTableData = [];
       if (props.configure.props.dataOrigin.dataSource === "service" && resultData.result) {
         tmpTableData = resultData.result[props.configure.props.dataOrigin.service.serviceDataField];
       } else if (props.configure.props.dataOrigin.dataSource === "variable") {
@@ -128,16 +148,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         );
       }
       if (tmpTableData) {
-        loadTable(tmpTableData);
+        loadTable(tmpTableData, resultData);
       }
     }
-    function loadTable(tmpTableData) {
+    function loadTable(tmpTableData2, resultData) {
+      var _a2;
       if (enableTransition("rowToColumn")) {
-        tmpTableData = rowDataToColumn(tmpTableData, props.configure);
+        tmpTableData2 = rowDataToColumn(tmpTableData2, props.configure);
         if (!isEnableGroupHeader.value) {
           const updatedColumnConfig = updateColumnConfig(
             tableColumnsConfig.value,
-            tmpTableData,
+            tmpTableData2,
             props.configure.props.dataOrigin.rowToColumn.titleColumns,
             props.configure.props.dataOrigin.rowToColumn.dataColumns
           );
@@ -147,18 +168,24 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (!isEnableGroupHeader.value) {
           tableColumnsConfig.value = getColumnToRowTableConfig(props.configure);
         }
-        tmpTableData = colDataToRow(tmpTableData, props.configure);
+        tmpTableData2 = colDataToRow(tmpTableData2, props.configure);
       }
       if (props.configure.props.dataOrigin.dataFormatting) {
         const func = getCustomFunc(props.pageContext, props.configure.props.dataOrigin.dataFormatting);
         if (func) {
-          const resultValue = func.apply(func, [{ tableData: tmpTableData }]);
+          const resultValue = func.apply(func, [{ tableData: tmpTableData2 }]);
           if (resultValue) {
-            tableData.value = resultValue;
+            tmpTableData2 = resultValue;
           }
         }
+      }
+      if (Object.keys(dataFormulaMapping.value).length > 0 && tmpTableData2 && tmpTableData2.length > 0) {
+        computeFormula(dataFormulaMapping.value, tmpTableData2);
+      }
+      if ((_a2 = props.configure.pageination) == null ? void 0 : _a2.enable) {
+        tableDataPageination(resultData);
       } else {
-        tableData.value = tmpTableData;
+        tableData.value = tmpTableData2;
       }
       if (props.configure.props.highOrder.groupField && props.configure.props.highOrder.groupField.length > 0) {
         const groupField = props.configure.props.highOrder.groupField;
@@ -172,7 +199,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function getHeaderCellStyle(data) {
       const cellTitleStyle = columnStyleSourceConfig.value[data.column.property] ? columnStyleSourceConfig.value[data.column.property].titleStyle : null;
       const rowTitleStyle = runtimeStyle == null ? void 0 : runtimeStyle.titleStyle;
-      return getHeaderCellStyleUtil(data, { cellTitleStyle, titleStyle: rowTitleStyle }, props);
+      return getHeaderCellStyleUtil(
+        data,
+        { cellTitleStyle, titleStyle: rowTitleStyle },
+        props
+      );
     }
     function getRowStyle(data) {
       return getRowStyleUtil(data, groupSummaryDataRowIndex, props);
@@ -310,18 +341,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const groupResult = Object.values(groupedData);
       for (let i = 0; i < groupResult.length; i++) {
         const group = groupResult[i];
-        const total = {};
+        const total2 = {};
         summaryColumns == null ? void 0 : summaryColumns.forEach((column) => {
           const prop = column.props.base.prop;
           const res = summaryStatistics(groupSummaryColumns.value[prop], group, prop, props.pageContext);
-          total[prop] = res;
+          total2[prop] = res;
         });
         result.push(...group);
         groupColumns == null ? void 0 : groupColumns.forEach((column) => {
           const prop = column.props.base.prop;
-          total[prop] = replacePlaceholders(column.props.base.summaryTitle, group[0]);
+          total2[prop] = replacePlaceholders(column.props.base.summaryTitle, group[0]);
         });
-        result.push(total);
+        result.push(total2);
         groupSummaryDataRowIndex.push(result.length - 1);
       }
       return result;
@@ -334,6 +365,53 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       }
     }
+    function tableDataPageination(resultData) {
+      if (props.configure.pageination.type === "frontend") {
+        total.value = tmpTableData.length;
+        frontendPageination(1, props.configure.pageination.pageSize);
+      } else if (props.configure.pageination.type === "backend") {
+        tableData.value = tmpTableData;
+        if (props.configure.pageination.totalFrom) {
+          total.value = resultData.result[props.configure.pageination.totalFrom];
+        }
+      }
+    }
+    function pageChange(currentPage, pageSize) {
+      if (props.configure.pageination.type === "frontend") {
+        frontendPageination(currentPage, pageSize);
+      } else {
+        backendPageination(currentPage, pageSize);
+      }
+    }
+    function pageSizeChange(currentPage, pageSize) {
+      if (props.configure.pageination.type === "frontend") {
+        frontendPageination(currentPage, pageSize);
+      } else {
+        backendPageination(currentPage, pageSize);
+      }
+    }
+    function frontendPageination(currentPage, pageSize) {
+      if (tmpTableData) {
+        tableData.value = tmpTableData.slice((currentPage - 1) * pageSize, currentPage * pageSize);
+      }
+    }
+    function backendPageination(currentPage, pageSize) {
+      if (props.configure.pageination.currentPageSet) {
+        setValueForVariableName(
+          props.pageContext.entity,
+          props.configure.pageination.currentPageSet,
+          currentPage
+        );
+      }
+      if (props.configure.pageination.pageSizeSet) {
+        setValueForVariableName(
+          props.pageContext.entity,
+          props.configure.pageination.pageSizeSet,
+          pageSize
+        );
+      }
+      updateChartDatasourcesByComponent(props.pageContext, props.configure.uuid);
+    }
     function exportChart() {
     }
     __expose({
@@ -391,7 +469,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }), 128))
           ]),
           _: 1
-        }, 8, ["data", "show-summary", "stripe"])
+        }, 8, ["data", "show-summary", "stripe"]),
+        __props.configure.pageination && __props.configure.pageination.enable ? (openBlock(), createBlock(_sfc_main$4, {
+          key: 0,
+          configure: __props.configure,
+          "table-data": tableData.value,
+          total: total.value,
+          onPageChange: pageChange,
+          onPageSizeChange: pageSizeChange
+        }, null, 8, ["configure", "table-data", "total"])) : createCommentVNode("", true)
       ], 6);
     };
   }

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

@@ -17,8 +17,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     onMounted(() => {
       if (thisRef.value && thisRef.value.parentNode) {
         const resizeObserver2 = new ResizeObserver((entries) => {
-          for (let entry of entries) {
-          }
           caculatePositionStyle();
         });
         resizeObserver2.observe(thisRef.value.parentNode);

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

@@ -1,10 +1,9 @@
 import { defineComponent, ref, onMounted, watch, onUnmounted, resolveComponent, openBlock, createElementBlock, createVNode, unref } from "vue";
-import "agilebuilder-ui";
 import { setTableEvents, canExecuteButton, doAfterClickEvent, getEventNameByType, doBeforeClickEvent, getHandleEvent, gridSelectRecord, gridSelectAllRecords, gridSelectionChange, cellClick, cellDblClick, rowClick, rowDblClick, headerClick } from "../../../../utils/events/event-util.js";
-import { getBaseUrl, getListCode, getRealRestApiPath } from "../../../../utils/common-util.js";
+import { getBaseUrl, getListCode, getRealRestApiPath, isWorkflowPage, isVariableInvalidValue } from "../../../../utils/common-util.js";
 import { getAdditionalParamMap, getSaveFormRequestWithRow, standardEvents } from "../../../../utils/events/standard-event.js";
 import { isPromise } from "agilebuilder-ui/src/utils/common-util";
-import { getDataTypeMapRequest, popupToPage } from "../../../../utils/table-utils.js";
+import { popupToPage } from "../../../../utils/table-utils.js";
 import eventBus from "../../../../utils/eventBus.js";
 import { getPermissionCodes, getDefaultValue } from "../../../../utils/page-init-util.js";
 import { decomposeVariable, getSizeConfig } from "../../../../utils/page-helper-util.js";
@@ -15,7 +14,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     pageContext: {},
     configure: {}
   },
-  setup(__props, { expose: __expose }) {
+  emits: ["setSafeDeleteTableCode"],
+  setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const pageContext = props.pageContext;
     let configure = props.configure;
@@ -38,9 +38,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       baseURL = window["$vueApp"].config.globalProperties.baseURL;
     }
     const operationButtonObj = ref({});
+    const linkageVariable = [];
     const listOptions = ref({});
     listOptions.value = getOptions();
-    const gridRef = ref(null);
+    const gridRef = ref();
     const urlToListData = getUrlToListData();
     const listCode = getListCode(pageContext.code, pageContext.version, configure.uuid);
     const myPageCode = pageContext.code;
@@ -52,6 +53,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const superGridSetting = superGridItems ? superGridItems[configure.uuid] : null;
     console.log("superGridSetting1111===", superGridItems, superGridSetting);
     const isCanShowMobileSearch = ref(false);
+    const $emit = __emit;
     onMounted(() => {
       window.addEventListener("message", recieveMessage);
       eventBus.$on(
@@ -76,6 +78,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         gridRef.value.scanDone(data);
       });
       listOptions.value["formSetMaxHeight"] = getComponentHeight();
+      if (listOptions.value && listOptions.value.configureObj.props.base && listOptions.value.configureObj.props.base.isSafeDelete) {
+        $emit("setSafeDeleteTableCode", listOptions.value.extraParam.tableName);
+      }
     });
     watch(
       () => props.pageContext.searchFormData,
@@ -89,26 +94,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         searchGridData(props.pageContext.entity.data);
       }
     );
-    const linkageVariable = [];
-    if (configure.props.linkages && configure.props.linkages.length > 0) {
-      configure.props.linkages.forEach((linkage) => {
-        const variablePath = decomposeVariable(linkage.fieldName);
-        if (variablePath && variablePath.length > 1) {
-          linkageVariable.push(variablePath[1]);
-        }
-      });
-      if (linkageVariable.length > 0) {
-        linkageVariable.forEach((variable) => {
-          watch(
-            () => props.pageContext.entity.page[variable],
-            () => {
-              const values = getLinkageVariableValues();
-              searchGridData(values);
-            }
-          );
-        });
-      }
-    }
     onUnmounted(() => {
       eventBus.$off(eventPageInfo + "-close-component-page-dialog");
       eventBus.$off(eventPageInfo + "_close-dialog-get-entity");
@@ -148,7 +133,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           esc: escRestorRow
         },
         indexContinuous: configure.props && configure.props.otherSettings ? configure.props.otherSettings.serialNumberContinuous : false,
-        initSearch: configure.props && configure.props.base.initializationQuery ? configure.props.base.initializationQuery : true,
+        initSearch: configure.props && configure.props.dataOrigin.initializationQuery === false ? false : true,
         // 初始化时是否查询，默认是查询
         resizeHeight: resizeListHeight,
         pageCode: pageContext.code,
@@ -162,7 +147,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         // 是否启用回车事件
         isWithDataPermission: configure.props && configure.props.otherSettings && configure.props.otherSettings.isWithDataPermission ? configure.props.otherSettings.isWithDataPermission : false,
         pageDevMode: false,
-        isWorkflowEntity: pageContext.workflowCode ? true : false,
+        isWorkflowEntity: isWorkflowPage(pageContext),
         tableClass: runtimeClass,
         tableStyle: runtimeStyle,
         pageContext,
@@ -174,7 +159,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       };
       setOperationButtons(options);
       setSortInfo(options);
-      myGetDataTypeMap();
+      if (configure.props.linkages && configure.props.linkages.length > 0) {
+        configure.props.linkages.forEach((linkage) => {
+          const variablePath = decomposeVariable(linkage.fieldName);
+          if (variablePath && variablePath.length > 1) {
+            linkageVariable.push(variablePath[1]);
+          }
+        });
+        if (linkageVariable.length > 0) {
+          addLinkageWatch();
+        }
+      }
       setTreeSetting(options);
       setGridEvents(options);
       return options;
@@ -191,17 +186,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         });
       }
     }
-    function myGetDataTypeMap(options) {
-      if (!backendUrl && !tableName) {
-        return;
-      }
-      getDataTypeMapRequest(backendUrl, tableName, pageContext.isTest).then((result) => {
-        if (!pageContext["dataTypeMaps"]) {
-          pageContext["dataTypeMaps"] = {};
-        }
-        pageContext["dataTypeMaps"][tableName] = result["dataTypeMap"];
-      });
-    }
     function setOperationButtons(options) {
       const showOperation = configure.props && configure.props.base ? configure.props.base.showOperation : false;
       const operationButtonSettings = configure.btnList;
@@ -503,10 +487,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     function searchGridData(data) {
-      if (!pageContext["dataTypeMaps"] || !pageContext["dataTypeMaps"][tableName]) {
+      if (!pageContext["dataTypeMaps"]) {
+        console.log("!pageContext['dataTypeMaps'] || !pageContext['dataTypeMaps'][tableName]");
         return;
       }
-      const dataTypeObj = pageContext["dataTypeMaps"][tableName];
+      const dataTypeObj = pageContext["dataTypeMaps"];
       let toolbarFieldParam = [];
       if (data) {
         for (var key in data) {
@@ -553,6 +538,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }
         }
       }
+      console.log("toolbarRefresh");
       gridRef.value.toolbarRefresh(null, null, toolbarFieldParam);
     }
     function resizeListHeight(params) {
@@ -599,7 +585,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         rowIndex,
         button
       };
-      debugger;
       const buttonConfigure = operationButtonObj.value[button.sourceButton.uuid];
       const tableConfigure = configure;
       buttonConfigure.props.base.tableUuid = tableConfigure.uuid;
@@ -709,9 +694,24 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         gridRef.value.showMobileSearch();
       }
     }
-    function canShowMobileSearch(listCode2) {
+    function canShowMobileSearchFunc(listCode2) {
       isCanShowMobileSearch.value = true;
     }
+    function getRowStyle(data) {
+      return getRowStyleUtil(data, [], props);
+    }
+    function getCellStyle(data) {
+      return getCellStyleUtil(data, data.cellStyle, props);
+    }
+    function getTitleStyle(data) {
+      const cellTitleStyle = data.titleStyle;
+      const rowTitleStyle = props.configure.style.titleStyle;
+      return getHeaderCellStyleUtil(
+        data,
+        { cellTitleStyle, titleStyle: rowTitleStyle },
+        props
+      );
+    }
     function getLinkageVariableValues() {
       const values = {};
       linkageVariable.forEach((variable) => {
@@ -719,16 +719,69 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       });
       return values;
     }
-    function getRowStyle(data) {
-      return getRowStyleUtil(data, null, props);
+    function addLinkageWatch() {
+      if (props.pageContext.toolsInputComponents && props.pageContext.toolsInputComponents.length > 0) {
+        let waitComponentRenderProps = [];
+        props.pageContext.toolsInputComponents.forEach((componentItem) => {
+          const isLinkComponent = configure.props.linkages.some(
+            (linkage) => linkage.fieldName === componentItem.prop
+          );
+          if (isLinkComponent && componentItem.defaultValue) {
+            const variablePath = decomposeVariable(componentItem.prop);
+            if (variablePath && variablePath.length > 1) {
+              waitComponentRenderProps.push(variablePath[1]);
+            }
+          }
+        });
+        if (waitComponentRenderProps.length === 0) {
+          linkageVariableWatch();
+        } else {
+          const values = getLinkageVariableValues();
+          waitComponentRenderProps = waitComponentRenderProps.filter((unsetVariable) => {
+            return isVariableInvalidValue(values, unsetVariable);
+          });
+          if (waitComponentRenderProps.length === 0) {
+            searchGridData(values);
+            linkageVariableWatch();
+          } else {
+            linkageVariable.forEach((variable) => {
+              watch(
+                () => props.pageContext.entity.page[variable],
+                () => {
+                  const values2 = getLinkageVariableValues();
+                  if (waitComponentRenderProps.length === 0) {
+                    searchGridData(values2);
+                  } else {
+                    waitComponentRenderProps = waitComponentRenderProps.filter((unsetVariable) => {
+                      return isVariableInvalidValue(values2, unsetVariable);
+                    });
+                    if (waitComponentRenderProps.length === 0) {
+                      searchGridData(values2);
+                    }
+                  }
+                },
+                { immediate: true }
+              );
+            });
+          }
+        }
+      }
     }
-    function getCellStyle(data) {
-      return getCellStyleUtil(data, data.cellStyle, props);
+    function linkageVariableWatch() {
+      linkageVariable.forEach((variable) => {
+        watch(
+          () => props.pageContext.entity.page[variable],
+          () => {
+            const values = getLinkageVariableValues();
+            searchGridData(values);
+          }
+        );
+      });
     }
-    function getTitleStyle(data) {
-      const cellTitleStyle = data.titleStyle;
-      const rowTitleStyle = props.configure.style.titleStyle;
-      return getHeaderCellStyleUtil(data, { cellTitleStyle, titleStyle: rowTitleStyle }, props);
+    function getTableSelectOptions() {
+      if (gridRef.value) {
+        return gridRef.value.getTableSelectOptions(listCode);
+      }
     }
     __expose({
       refresh,
@@ -739,7 +792,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       getTableConfigure,
       isDeleteChange,
       validatorSunTableListData,
-      showMobileSearch
+      showMobileSearch,
+      getTableSelectOptions
     });
     return (_ctx, _cache) => {
       const _component_super_grid = resolveComponent("super-grid");
@@ -763,7 +817,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           onHeaderClick: headerClickEvent,
           onRefresh: clearSelections,
           onNewOpenGridDialog: unref(popupToPage),
-          onCanShowMobileSearch: canShowMobileSearch
+          onCanShowMobileSearch: canShowMobileSearchFunc
         }, null, 8, ["url", "options", "code", "settings", "search-form-info", "list-toolbar-form-data", "onNewOpenGridDialog"])
       ]);
     };

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

@@ -1,6 +1,6 @@
 import { defineComponent, ref, onMounted, onUnmounted, resolveComponent, openBlock, createElementBlock, createBlock, unref, createCommentVNode } from "vue";
 import { setTableEvents, gridSelectRecord, gridSelectAllRecords, gridSelectionChange, cellClick, cellDblClick, rowClick, rowDblClick, headerClick } from "../../../../utils/events/event-util.js";
-import { getSizeConfig, getVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
+import { setVariableValue, getVariableValue, getSizeConfig } from "../../../../utils/page-helper-util.js";
 import { getModelFields, getDefaultValue } from "../../../../utils/page-init-util.js";
 import eventBus from "../../../../utils/eventBus.js";
 import { popupToPage } from "../../../../utils/table-utils.js";
@@ -13,7 +13,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     pageContext: {},
     configure: {}
   },
-  setup(__props, { expose: __expose }) {
+  emits: ["setSafeDeleteTableCode"],
+  setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const pageContext = props.pageContext;
     const configure = props.configure;
@@ -56,6 +57,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       rowStyleRender: getRowStyle,
       titleStyleRender: getTitleStyle
     });
+    const $emit = __emit;
     if (runtimeStyle) {
       listViewOptions.value["tableStyle"] = runtimeStyle;
     }
@@ -80,15 +82,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (subTableWatchProps && subTableWatchProps[tableUuid] && subTableWatchProps[tableUuid].length > 0) {
           const mainFormProps = subTableWatchProps[tableUuid];
           if (mainFormProps.indexOf(propName) >= 0) {
-            if (gridRef.value) {
-              changeInitializationSubTable();
-            }
+            reloadSubTableData();
           }
         }
       });
       eventBus.$on("_refreshSubTableHandle_" + tableUuid, (params) => {
         console.log("-_refreshSubTableHandle_--tableUuid=", tableUuid, "params=", params);
-        changeInitializationSubTable();
+        reloadSubTableData();
       });
       eventBus.$on(
         "_refreshChildData_" + tableUuid,
@@ -105,7 +105,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         console.log("superPage5555---listCode---scanDone--listCode=", listCode, "data=", data);
         gridRef.value.scanDone(data);
       });
+      if (listViewOptions.value && listViewOptions.value.configureObj.props.base && listViewOptions.value.configureObj.props.base.isSafeDelete) {
+        $emit("setSafeDeleteTableCode", listViewOptions.value.extraParam.tableName);
+      }
     });
+    function reloadSubTableData() {
+      if (gridRef.value) {
+        listViewOptions.value["subTableData"] = null;
+        gridRef.value.reloadSubTableData(listCode);
+      }
+    }
     onUnmounted(() => {
       const tableUuid = configure.uuid;
       eventBus.$off("_refreshSubTable_" + tableUuid);
@@ -497,7 +506,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }, 10);
     }
     function getRowStyle(data) {
-      return getRowStyleUtil(data, null, props);
+      const style = getRowStyleUtil(data, null, props);
+      console.log("getRowStyle----style=", style);
+      return style;
     }
     function getCellStyle(data) {
       return getCellStyleUtil(data, data.cellStyle, props);
@@ -507,6 +518,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const rowTitleStyle = props.configure.style.titleStyle;
       return getHeaderCellStyleUtil(data, { cellTitleStyle, titleStyle: rowTitleStyle }, props);
     }
+    function getTableSelectOptions() {
+      if (gridRef.value) {
+        return gridRef.value.getTableSelectOptions(listCode);
+      }
+    }
     __expose({
       createRow,
       getSelections,
@@ -515,7 +531,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       getTableConfigure,
       validatorSunTableListData,
       getValue,
-      setValue
+      setValue,
+      getTableSelectOptions
     });
     return (_ctx, _cache) => {
       const _component_super_grid = resolveComponent("super-grid");

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

@@ -29,6 +29,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return gridRef.value.validatorSunTableListData();
       }
     }
+    function setSafeDeleteTableCode(code) {
+      if (props.pageContext.entity.data._SAFE_DELETE_TABLE_NAMES) {
+        props.pageContext.entity.data._SAFE_DELETE_TABLE_NAMES.push(code);
+      } else {
+        props.pageContext.entity.data._SAFE_DELETE_TABLE_NAMES = [code];
+      }
+    }
     function clearSelections() {
       return gridRef.value.clearSelections();
     }
@@ -57,6 +64,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function showMobileSearch() {
       gridRef.value.showMobileSearch();
     }
+    function getTableSelectOptions() {
+      if (gridRef.value) {
+        return gridRef.value.getTableSelectOptions();
+      }
+    }
     __expose({
       refresh,
       createRow,
@@ -66,7 +78,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       getTableConfigure,
       isDeleteChange,
       validatorSunTableListData,
-      showMobileSearch
+      showMobileSearch,
+      getTableSelectOptions
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", null, [
@@ -75,13 +88,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ref_key: "gridRef",
           ref: gridRef,
           pageContext: _ctx.pageContext,
-          configure: tableConfigure.value
+          configure: tableConfigure.value,
+          onSetSafeDeleteTableCode: setSafeDeleteTableCode
         }, null, 8, ["pageContext", "configure"])) : (openBlock(), createBlock(_sfc_main$2, {
           key: 1,
           ref_key: "gridRef",
           ref: gridRef,
           pageContext: _ctx.pageContext,
-          configure: tableConfigure.value
+          configure: tableConfigure.value,
+          onSetSafeDeleteTableCode: setSafeDeleteTableCode
         }, null, 8, ["pageContext", "configure"]))
       ]);
     };

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

@@ -16,7 +16,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const dynamicModelMethod = computed({
       get() {
         let val = getVariableValue(entity, dynamicFields);
-        if (val) {
+        if (val && typeof val === "string") {
           val = val.split(",");
         }
         return val;