super-page-runtime 2.1.72 → 2.1.73

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

@@ -2,7 +2,7 @@ import { setValueForVariableName, getOptionDatasSourceMap, getComponentOptionDat
 import { getComponentRefByCode, getComponentRef } from "../global-refs.js";
 import eventBus from "../eventBus.js";
 import http from "agilebuilder-ui/src/utils/request";
-import { getAdditionalParamMap, refreshPage } from "../events/standard-event.js";
+import { getAdditionalParamMap, refreshPage, getFormData } from "../events/standard-event.js";
 import { updateFormItemEditState, disabledAllFields, dynamicControlTableEdit } from "../events/validator-util.js";
 import { getBaseUrl, deepCopy } from "../common-util.js";
 import { isMobileBrowser } from "agilebuilder-ui/src/utils/common-util";
@@ -376,6 +376,15 @@ const functions = {
       }
     }
     return viewEntity.data;
+  },
+  /**
+   * 重新走gets请求获得表单数据
+   * @param pageContext 
+   * @param id 
+   * @returns commonEntity数据
+   */
+  getFormData(pageContext, id) {
+    return getFormData(pageContext, id);
   }
 };
 function packageSubTableShowLable(subTableOptions, subData) {

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

@@ -4,9 +4,10 @@ import { validateDataModelFunc } from "./validator-util.js";
 import { getComponentRef, getComponentRefByCode } from "../global-refs.js";
 import { ElMessage } from "element-plus";
 import { analysisCondition } from "agilebuilder-ui/src/utils/util";
-import { getListCode } from "../common-util.js";
+import { getListCode, deepCopy } from "../common-util.js";
 import eventBus from "../eventBus.js";
 import { getValueFromSource } from "../page-helper-util.js";
+import { expressJump } from "../table-utils.js";
 const skipValidateEvents = [
   "downloadTemplate",
   "back",
@@ -378,13 +379,41 @@ function doAfterClickFunc(pageContext, configure, eventParams, isStandardEvent,
 }
 function doClickEvent(pageContext, configure, clickEventFunObj, eventParams) {
   const linkPage = configure.props.linkPage;
-  if (linkPage && linkPage.jumpPageUrl) {
+  if (linkPage && linkPage instanceof Array) {
+    pageContext.canClick = true;
+    const row = getRowData(eventParams);
+    const result = expressJump(pageContext, configure, linkPage, row);
+    let show = false;
+    let toLinkPage;
+    if (result) {
+      show = result.show;
+      toLinkPage = result.toPage;
+    }
+    if (show && toLinkPage) {
+      let configureObj = deepCopy(configure);
+      configureObj.props.linkPage = toLinkPage.linkPage;
+      doClickJumpPageEvent(pageContext, configureObj, eventParams);
+    } else {
+      ElMessage({
+        showClose: true,
+        type: "warning",
+        message: "没有符合条件的跳转页面"
+      });
+    }
+  } else if (linkPage && linkPage.jumpPageUrl) {
     pageContext.canClick = true;
     doClickJumpPageEvent(pageContext, configure, eventParams);
   } else {
     doClickCustomEvent(pageContext, configure, clickEventFunObj, eventParams);
   }
 }
+function getRowData(eventParams) {
+  let row = eventParams ? eventParams.row : null;
+  if (!row) {
+    row = eventParams && eventParams.selections && eventParams.selections.length > 0 ? eventParams.selections[0] : null;
+  }
+  return row;
+}
 function getEventByEventName(pageContext, eventObj) {
   const eventsObj = pageContext.customEvents;
   if (eventsObj && eventObj) {

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

@@ -17,3 +17,8 @@ export declare function updateFormItemEditState(pageContext: PageContext, custom
 export declare function disabledAllFields(pageContext: PageContext): void;
 export declare function dynamicControlTableEdit(pageContext: PageContext, customRules: any[], tableCode?: any): void;
 export declare function updateComponentDisplayState(ref: any, item: any): void;
+/**
+ * 布尔型校验需要自定义，为了兼容oracle和mysql数据库
+ * @param fieldRule
+ */
+export declare function packageBooleanRule(fieldRule: any): void;

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

@@ -346,6 +346,7 @@ function packageCustomRules(orgCustomRules, orgRules) {
         }
       });
     } else {
+      packageBooleanRule(customRules[key]);
       orgRules[key] = customRules[key];
     }
   });
@@ -547,12 +548,31 @@ function updateComponentDisplayState(ref, item) {
     }
   }
 }
+function packageBooleanRule(fieldRule) {
+  if (fieldRule.type && fieldRule.type === "boolean") {
+    fieldRule.validator = function(rule, value, callback) {
+      if (value === void 0 || value === null) {
+        if (rule.required) {
+          return false;
+        } else {
+          return true;
+        }
+      } else if (typeof value === "number" && (value === 1 || value === 0)) {
+        return true;
+      } else if (typeof value === "boolean" && (value === true || value === false)) {
+        return true;
+      }
+      return false;
+    };
+  }
+}
 export {
   disabledAllFields,
   dynamicControlTableEdit,
   getWorkflowRules,
   i18nValidatePropRulesMessage,
   i18nValidateRulesMessage,
+  packageBooleanRule,
   packageCustomRules,
   setObjectPropRule,
   updateComponentDisplayState,

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

@@ -147,7 +147,7 @@ export declare function openLink(component: Component, pageContext: PageContext)
  * @param configure 组件配置参数
  * @param showConditions 显示条件
  */
-export declare function caculateShowCondition(pageContext: PageContext, configure: Component, showConditions: Array<any>): any;
+export declare function caculateShowCondition(pageContext: PageContext, showConditions: Array<any>, row?: any): any;
 /**
  * 监控变化的字段
  * @param pageContext

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

@@ -242,8 +242,8 @@ function updateOptionDatasources(pageContext2, dataSourceConfs, query) {
     });
   });
 }
-function getOptionDatasFromPage(pageContext2, configure2) {
-  return getComponentOptionDatasFromPage(pageContext2, configure2.uuid);
+function getOptionDatasFromPage(pageContext2, configure) {
+  return getComponentOptionDatasFromPage(pageContext2, configure.uuid);
 }
 function getComponentOptionDatasFromPage(pageContext2, configureUuid) {
   const optionSourceMap = getOptionDatasSourceMap(pageContext2);
@@ -257,11 +257,11 @@ function getOptionDatasSourceMap(pageContext2) {
   const cacheOptions = pageContext2.optionSourceMap;
   return cacheOptions ? cacheOptions : {};
 }
-function getChartDatasFromPage(pageContext2, configure2) {
-  if (!pageContext2 || !pageContext2.chartDataSourceMap || !configure2) {
+function getChartDatasFromPage(pageContext2, configure) {
+  if (!pageContext2 || !pageContext2.chartDataSourceMap || !configure) {
     return null;
   }
-  const cacheDatas = pageContext2.chartDataSourceMap[configure2.uuid];
+  const cacheDatas = pageContext2.chartDataSourceMap[configure.uuid];
   return cacheDatas;
 }
 function queryOptionDatasources(pageContext2, dataSourceConf, query) {
@@ -424,7 +424,7 @@ function formatValueByType(value, formatType, formatInfo) {
   }
   return value;
 }
-function getValueFromVariable(entity, variable, row) {
+function getValueFromVariable(entity, variable, row2) {
   if (variable == null || variable == void 0) {
     return variable;
   }
@@ -460,7 +460,7 @@ function getValueFromVariable(entity, variable, row) {
       return paramName.substring(6);
     } else if (paramName.startsWith("row.")) {
       paramName = paramName.substring(4);
-      valueSource = row;
+      valueSource = row2;
       paramType = "row";
     }
     if (!paramName) {
@@ -513,7 +513,7 @@ function getValueFromSource(valueSource, paramName, paramType) {
     return valueSource[paramName];
   }
 }
-function caculateShowCondition(pageContext, configure, showConditions) {
+function caculateShowCondition(pageContext, showConditions, row) {
   if (!showConditions || showConditions.length == 0 || !pageContext || !pageContext.entity) {
     return true;
   }
@@ -530,8 +530,8 @@ function caculateShowCondition(pageContext, configure, showConditions) {
     if (!operator) {
       operator = "EQ";
     }
-    const leftValue = getValueFromVariable(entityData, propName);
-    let propValue = getValueFromVariable(entityData, condition.propValue);
+    const leftValue = getValueFromVariable(entityData, propName, row);
+    let propValue = getValueFromVariable(entityData, condition.propValue, row);
     const dataType = condition.dataType;
     if (operator == "CONTAIN" || operator == "NOT_CONTAIN") {
       if (leftValue && !leftValue.includes) {
@@ -641,14 +641,14 @@ function getFormPropName(prop) {
     return prop;
   }
 }
-function getSizeConfig(pageContext2, configure2) {
+function getSizeConfig(pageContext2, configure) {
   const pageModeType = getPageModeType(pageContext2);
   let sizeConfig;
-  if (configure2.props && configure2.props.size && configure2.props.size[pageModeType]) {
-    sizeConfig = configure2.props.size[pageModeType];
+  if (configure.props && configure.props.size && configure.props.size[pageModeType]) {
+    sizeConfig = configure.props.size[pageModeType];
   }
-  if (!sizeConfig && configure2.props && configure2.props.size) {
-    sizeConfig = configure2.props.size["pc"];
+  if (!sizeConfig && configure.props && configure.props.size) {
+    sizeConfig = configure.props.size["pc"];
   }
   return sizeConfig;
 }

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

@@ -5,6 +5,7 @@ import { setVariableValue, formatVariableValue, getFormPropName } from "./page-h
 import { getSessionCache } from "agilebuilder-ui/src/utils/auth";
 import { functions } from "./api/page-expose-util.js";
 import { isWorkflowPage, deepCopy } from "./common-util.js";
+import { packageBooleanRule } from "./events/validator-util.js";
 function queryPageDesignByCode(pageCode) {
   return http.get(
     window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/runtime/" + pageCode
@@ -317,6 +318,9 @@ function packageFormRules(pageContext, configure) {
       if (!pageContext.rules[propName]) {
         pageContext.rules[propName] = [];
       }
+      configure.props.rules.forEach((fieldRule) => {
+        packageBooleanRule(fieldRule);
+      });
       pageContext.rules[propName] = configure.props.rules;
     }
     if (!allFieldsDisabled && configure.name !== "button-detail" && pageContext.fieldPermissionMap) {

package/dist/es/components/runtime/utils/table-utils.d.ts

@@ -2,3 +2,15 @@ export declare function getDataTypeMapRequest(backendUrl: any, tableName: any, i
 export declare function popupToPage(params: any): void;
 export declare function getTableNameByTableUuid(pageContext: any, tableUuid: any): any;
 export declare function getOperationButtons(pageContext: any, configure: any, operations: any, clickEventFunc?: Function): void;
+/**
+ * 解析跳转条件配置
+ * @param pageContext
+ * @param configure
+ * @param linkPage
+ * @param row
+ * @returns
+ */
+export declare function expressJump(pageContext: any, configure: any, linkPage: any, row: any): {
+    show: any;
+    toPage: any;
+};

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

@@ -3,8 +3,9 @@ import "agilebuilder-ui/src/utils/util";
 import "agilebuilder-ui/src/utils/request";
 import eventBus from "./eventBus.js";
 import { getPermissionCodes } from "./page-init-util.js";
-import { getEventFuncByType } from "./events/event-util.js";
+import { getEventFuncByType, getCustomFunc } from "./events/event-util.js";
 import { $t } from "./i18n-util.js";
+import { ExpressionEvaluator } from "../views/assemblys/chart/table/chart-table-util.js";
 function popupToPage(params) {
   const pageCode = params.pageContext && params.pageContext.code;
   console.log("弹框显示页面--popupToPage====params=", params);
@@ -53,7 +54,41 @@ function getOperationButtons(pageContext, configure, operations, clickEventFunc)
     });
   }
 }
+function expressJump(pageContext, configure, linkPage, row) {
+  let toPage;
+  const show = linkPage == null ? void 0 : linkPage.some((item) => {
+    let canShow = false;
+    if (item.scopeFunc) {
+      const func = getCustomFunc(pageContext, item.scopeFunc);
+      if (func) {
+        const result = func.apply(func, [
+          {
+            pageContext,
+            configureObj: configure,
+            row
+          }
+        ]);
+        if (result) {
+          canShow = true;
+        }
+      }
+    } else if (item.showCondition && item.showCondition.length > 0) {
+      const result = ExpressionEvaluator.evaluate(pageContext, item.showCondition, row);
+      if (result) {
+        canShow = true;
+      }
+    } else {
+      canShow = true;
+    }
+    if (canShow) {
+      toPage = item;
+      return true;
+    }
+  });
+  return { show, toPage };
+}
 export {
+  expressJump,
   getOperationButtons,
   getTableNameByTableUuid,
   popupToPage

package/dist/es/components/runtime/views/assemblys/chart/table/chart-table-util.d.ts

@@ -0,0 +1,79 @@
+import { Component, PageContext } from '../../../../utils/interfaces/page-design-types';
+
+type Condition = {
+    propValueType: string;
+    joinSign: string;
+    dataType: 'number' | 'date' | 'string';
+    rightBracket: string;
+    leftBracket: string;
+    propValue: string;
+    propName: string;
+    operator: 'GT' | 'LT' | 'GET' | 'LET' | 'NET' | 'CONTAIN' | 'NOT_CONTAIN' | 'IS_NULL' | 'IS_NOT_NULL';
+};
+type Data = Record<string, any>;
+export declare class ExpressionEvaluator {
+    static evaluate(pageContext: PageContext, conditions: Condition[], data: Data): boolean;
+    private static createExpression;
+    private static getComparisonExpression;
+    private static changeDataType;
+    private static parseValue;
+    private static evaluateExpression;
+}
+export declare function getSummaryTitleColumn(configure: Component): any;
+export declare function getSummaryDataColumn(configure: Component, type: string): any;
+/**
+ *
+ * @param summaryColumn configure.props.summaries.dataColumn中保存的对应属性的配置
+ * @param data 数组数据
+ * @param column el-table传递的column
+ * @param pageContext 页面上下文
+ * @returns
+ */
+export declare function summaryStatistics(summaryColumn: any, data: any, prop: string, pageContext: PageContext): string;
+export declare function replacePlaceholders(template: string, data: {
+    [key: string]: any;
+}): string;
+export declare function getHeaderCellStyleUtil(data: any, runtimeStyle: any, props: any): any;
+export declare function getRowStyleUtil(data: any, groupSummaryDataRowIndex: number[], props: any): any;
+export declare function getCellStyleUtil(data: any, cellStyles: any, props: any): {};
+export declare function rowDataToColumn(data: any, configure: Component): any;
+/**
+ *
+ * @param data 数据
+ * @param configure
+ * @returns
+ */
+export declare function colDataToRow(data: any, configure: Component): any;
+export declare function getColumnToRowTableConfig(configure: Component): any;
+export declare function getIndexColumn(): {
+    props: {
+        base: {
+            name: string;
+            prop: string;
+            columnWidth: number;
+            sortable: boolean;
+            visible: boolean;
+            displayOrder: number;
+            alignTitle: string;
+            alignContent: string;
+        };
+    };
+    events: any[];
+    style: {
+        titleFont: {};
+        contentFont: {};
+        width: {};
+        background: {};
+        tableCell: {
+            type: string;
+            model: string;
+        }[];
+        conentPadding: {};
+        tittlePadding: {};
+        border: {};
+        shadow: {};
+        tittleClass: string;
+    };
+};
+export declare function computeFormula(itemConfs: any, datas: any): void;
+export {};

package/dist/es/components/runtime/views/assemblys/chart/table/normal-column.vue.js

@@ -1,7 +1,11 @@
 import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createElementBlock, Fragment, createTextVNode, toDisplayString, resolveDynamicComponent, createVNode, normalizeClass, createCommentVNode, createElementVNode } from "vue";
 import { getCustomFunc } from "../../../../utils/events/event-util.js";
 import eventBus from "../../../../utils/eventBus.js";
-import { ExpressionEvaluator } from "./chart-table-util.js";
+import "agilebuilder-ui/src/utils/request";
+import "dayjs";
+import "agilebuilder-ui/src/utils/calculator/calculator-util";
+import "../../../../utils/global-refs.js";
+import { expressJump } from "../../../../utils/table-utils.js";
 const _hoisted_1 = { key: 0 };
 const _hoisted_2 = { key: 1 };
 const _hoisted_3 = { key: 1 };
@@ -38,36 +42,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function formatter(row, column, cellValue, index) {
     }
     function showLink(row) {
-      var _a;
-      const show = (_a = props.column.linkPage) == null ? void 0 : _a.some((item) => {
-        let canShow = false;
-        if (item.scopeFunc) {
-          const func = getCustomFunc(props.pageContext, item.scopeFunc);
-          if (func) {
-            const result = func.apply(func, [
-              {
-                pageContext: props.pageContext,
-                configureObj: props.configure,
-                row
-              }
-            ]);
-            if (result) {
-              canShow = true;
-            }
-          }
-        } else if (item.showCondition && item.showCondition.length > 0) {
-          const result = ExpressionEvaluator.evaluate(props.pageContext, item.showCondition, row);
-          if (result) {
-            canShow = true;
-          }
-        } else {
-          canShow = true;
-        }
-        if (canShow) {
-          toPage = item;
-          return true;
-        }
-      });
+      const result = expressJump(props.pageContext, props.configure, props.column.linkPage, row);
+      let show = false;
+      if (result) {
+        show = result.show;
+        toPage = result.toPage;
+      }
       return show;
     }
     function clickLink(row) {

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

@@ -1,6 +1,6 @@
 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, getValueFromVariable, isPromise, setValueForVariableName, updateChartDatasourcesByComponent } from "../../../../utils/page-helper-util.js";
+import { getChartDatasFromPage, getValueFromVariable, isPromise, setValueForVariableName, updateChartDatasourcesByComponent, caculateShowCondition } 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";
@@ -43,6 +43,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const groupSummaryDataRowIndex = [];
     const columnStyleSourceConfig = ref({});
     const dataFormulaMapping = ref({});
+    const gridRef = ref(null);
     const total = ref(0);
     let tmpTableData = [];
     if (!props.configure.props.modelCustom) {
@@ -412,6 +413,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       updateChartDatasourcesByComponent(props.pageContext, props.configure.uuid);
     }
+    function calacShowColumn(column) {
+      const showCondition = column.showCondition;
+      return caculateShowCondition(props.pageContext, showCondition);
+    }
     function exportChart() {
     }
     __expose({
@@ -435,6 +440,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           [vShow, unref(headerInfo).showHeader]
         ]),
         createVNode(_component_el_table, {
+          ref_key: "gridRef",
+          ref: gridRef,
           data: tableData.value,
           style: { "width": "100%" },
           "header-cell-style": getHeaderCellStyle,
@@ -454,20 +461,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   pageContext: __props.pageContext,
                   groupColumn: item,
                   columnsConfigKeyValues: columnsConfigKeyValues.value
-                }, null, 8, ["configure", "pageContext", "groupColumn", "columnsConfigKeyValues"])) : (openBlock(), createBlock(_sfc_main$3, {
+                }, null, 8, ["configure", "pageContext", "groupColumn", "columnsConfigKeyValues"])) : calacShowColumn(columnsConfigKeyValues.value[item.columnUuid]) ? (openBlock(), createBlock(_sfc_main$3, {
                   key: 1,
                   configure: __props.configure,
                   pageContext: __props.pageContext,
                   column: columnsConfigKeyValues.value[item.columnUuid]
-                }, null, 8, ["configure", "pageContext", "column"]))
+                }, null, 8, ["configure", "pageContext", "column"])) : createCommentVNode("", true)
               ], 64);
             }), 128)) : (openBlock(true), createElementBlock(Fragment, { key: 1 }, renderList(tableColumnsConfig.value, (column, index) => {
-              return openBlock(), createBlock(_sfc_main$3, {
-                key: index,
-                column,
-                configure: __props.configure,
-                pageContext: __props.pageContext
-              }, null, 8, ["column", "configure", "pageContext"]);
+              return openBlock(), createElementBlock(Fragment, { key: index }, [
+                calacShowColumn(column) ? (openBlock(), createBlock(_sfc_main$3, {
+                  key: 0,
+                  column,
+                  configure: __props.configure,
+                  pageContext: __props.pageContext
+                }, null, 8, ["column", "configure", "pageContext"])) : createCommentVNode("", true)
+              ], 64);
             }), 128))
           ]),
           _: 1

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

@@ -768,10 +768,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function dynamicControlTableEdit(pageContext2, customRules, listCode2) {
       if (gridRef.value) {
-        debugger;
         gridRef.value.dynamicControlTableEdit(pageContext2, customRules, listCode2);
       }
     }
+    function doLayout(hiddenColumns) {
+      if (gridRef.value) {
+        gridRef.value.doLayout(hiddenColumns);
+      }
+    }
     __expose({
       refresh,
       createRow,
@@ -783,7 +787,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       validatorSunTableListData,
       showMobileSearch,
       getTableSelectOptions,
-      dynamicControlTableEdit
+      dynamicControlTableEdit,
+      doLayout
     });
     return (_ctx, _cache) => {
       const _component_super_grid = resolveComponent("super-grid");

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 { setVariableValue, getVariableValue, getSizeConfig } from "../../../../utils/page-helper-util.js";
+import { caculateShowCondition, 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, getOperationButtons } from "../../../../utils/table-utils.js";
@@ -250,7 +250,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       const subTableOperations = getOperations();
       listViewOptions.value["operations"]["operation"] = subTableOperations;
-      listViewOptions.value["subTableCanAdd"] = isShowAdd();
+      listViewOptions.value["subTableCanAdd"] = isShowAddWf();
     }
     function setGridToStore() {
       if (!pageContext.tableUuids) {
@@ -262,7 +262,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function getOperations() {
       let operations = [];
-      if (isShowAdd()) {
+      let isShowOperation = caculateShowCondition(props.pageContext, configure.props.base.showOperationCondition);
+      if (isShowOperation && isShowAddWf()) {
         const addButton = {
           props: {
             elementType: "el-button",
@@ -272,11 +273,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             size: "mini",
             permission: "true"
           },
-          onClick: addSubTableData
+          onClick: addSubTableData,
+          isShow: isShowAdd
         };
         operations.push(addButton);
       }
-      if (isShowDelete(null, null, null, null, null, true)) {
+      if (isShowOperation && isShowDeleteWf(null, null, null, null, null, true)) {
         const removeButton = {
           props: {
             elementType: "el-button",
@@ -302,7 +304,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return row.ID;
       }
     }
-    function isShowAdd() {
+    function isShowAddWf(originalValue, formatValue, row, column, rowIndex, isFormJudge) {
+      const isShowOperation = caculateShowCondition(props.pageContext, configure.props.base.showOperationCondition);
+      if (!isShowOperation) {
+        return false;
+      }
       const fieldPermissionMap = pageContext.fieldPermissionMap;
       const actionPermissionMap = pageContext.actionPermissionMap;
       let canAdd = true;
@@ -323,7 +329,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       return canAdd;
     }
-    function isShowDelete(originalValue, formatValue, row, column, rowIndex, isFormJudge) {
+    function isShowAdd(originalValue, formatValue, row, column, rowIndex, isFormJudge) {
+      let canAdd = isShowAddWf();
+      if (canAdd === true) {
+        canAdd = caculateShowCondition(props.pageContext, configure.props.base.showAddBtnCondition, row);
+      }
+      return canAdd;
+    }
+    function isShowDeleteWf(originalValue, formatValue, row, column, rowIndex, isFormJudge) {
       const fieldPermissionMap = pageContext.fieldPermissionMap;
       const actionPermissionMap = pageContext.actionPermissionMap;
       let canDelete = true;
@@ -362,6 +375,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       return canDelete;
     }
+    function isShowDelete(originalValue, formatValue, row, column, rowIndex, isFormJudge) {
+      let canDelete = isShowDeleteWf(originalValue, formatValue, row, column, rowIndex, isFormJudge);
+      if (canDelete === true) {
+        canDelete = caculateShowCondition(props.pageContext, configure.props.base.showDeleteBtnCondition, row);
+      }
+      return canDelete;
+    }
     function addSubTableData(originalValue, formatValue, row, column, rowIndex) {
       gridRef.value.createRow(listCode, {}, { getDefaultValueFunc: getDefaultValue });
     }
@@ -529,6 +549,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         gridRef.value.dynamicControlTableEdit(pageContext2, customRules, listCode2);
       }
     }
+    function doLayout(hiddenColumns) {
+      if (gridRef.value) {
+        gridRef.value.doLayout(hiddenColumns);
+      }
+    }
     __expose({
       createRow,
       getSelections,
@@ -539,7 +564,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       getValue,
       setValue,
       getTableSelectOptions,
-      dynamicControlTableEdit
+      dynamicControlTableEdit,
+      doLayout
     });
     return (_ctx, _cache) => {
       const _component_super_grid = resolveComponent("super-grid");

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

@@ -77,6 +77,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function getTableUuid() {
       return props.configure.uuid;
     }
+    function doLayout(hiddenColumns) {
+      if (gridRef.value) {
+        gridRef.value.doLayout(hiddenColumns);
+      }
+    }
     __expose({
       refresh,
       createRow,
@@ -89,7 +94,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       showMobileSearch,
       getTableSelectOptions,
       dynamicControlTableEdit,
-      getTableUuid
+      getTableUuid,
+      doLayout
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", null, [

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

@@ -1,4 +1,4 @@
-import { defineComponent, computed, ref, onMounted, nextTick, resolveComponent, openBlock, createElementBlock, normalizeClass, unref, createBlock, normalizeStyle, withCtx, createElementVNode, createVNode, toDisplayString, createCommentVNode } from "vue";
+import { defineComponent, computed, ref, onMounted, nextTick, watch, resolveComponent, openBlock, createElementBlock, normalizeClass, unref, createBlock, createCommentVNode, normalizeStyle, withCtx, createElementVNode, createVNode, toDisplayString } from "vue";
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
 import { getVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
 import { getMenuTreeData } from "../../../../utils/tree-utils.js";
@@ -45,6 +45,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const isShowTree = ref(false);
     const menuData = ref(null);
     const selectNode = ref(null);
+    const filterText = ref("");
+    const isSearch = ref(false);
     onMounted(() => {
       nextTick(() => {
         const value = dynamicModelMethod.value;
@@ -64,6 +66,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     } else {
       isShowTree.value = true;
     }
+    watch(filterText, (val) => {
+      isSearch.value = true;
+      menuTree.value.filter(val);
+    });
+    const filterNode = (value, data) => {
+      if (!value)
+        return true;
+      return data.name.includes(value);
+    };
     function handleNodeClick(data, node, nodeTree) {
       selectNode.value = node;
       handleFormEvent(null, props.pageContext, props.configure, "node-click", {
@@ -85,11 +96,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function initLoadNode(parentNodeId, node, resolve) {
       const param = {
         parentNodeId,
-        data: node.data
+        data: node.data,
         // 节点详细信息，json字符串
+        searchValue: filterText,
+        // 查询条件
+        isSearch: isSearch.value
+        // 是否是查询
       };
       getMenuTreeData(props.pageContext, props.configure, parentNodeId, node, param).then(
         (treeNodes) => {
+          isSearch.value = false;
           resolve(treeNodes);
           if (parentNodeId === "0") {
             const rootNodeId = treeNodes[0].nodeId;
@@ -101,10 +117,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function loadRootNode(rootNodeId, node) {
       const param = {
         parentNodeId: rootNodeId,
-        data: node.data
+        data: node.data,
         // 节点详细信息，json字符串
+        searchValue: filterText,
+        // 查询条件
+        isSearch: isSearch.value
+        // 是否是查询
       };
       getMenuTreeData(props.pageContext, props.configure, rootNodeId, node, param).then((children) => {
+        isSearch.value = false;
         menuTree.value.updateKeyChildren(rootNodeId, children);
         if (menuTree.value.store.nodesMap[rootNodeId]) {
           menuTree.value.store.nodesMap[rootNodeId].expanded = true;
@@ -118,11 +139,23 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       node.loaded = false;
       node.expand();
     }
+    function loadTreeNodes() {
+      getMenuTreeData(props.pageContext, props.configure).then((treeNodes) => {
+        isSearch.value = false;
+        menuData.value = treeNodes;
+      });
+    }
+    function getNode(node) {
+      menuTree.value.getNode(node);
+    }
     __expose({
       getSelectNode,
-      expandNode
+      expandNode,
+      loadTreeNodes,
+      getNode
     });
     return (_ctx, _cache) => {
+      const _component_el_input = resolveComponent("el-input");
       const _component_SuperIcon = resolveComponent("SuperIcon");
       const _component_Folder = resolveComponent("Folder");
       const _component_el_icon = resolveComponent("el-icon");
@@ -130,8 +163,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return openBlock(), createElementBlock("div", {
         class: normalizeClass(unref(runtimeClass))
       }, [
-        isShowTree.value ? (openBlock(), createBlock(_component_el_tree, {
+        designProperty.value.filter ? (openBlock(), createBlock(_component_el_input, {
           key: 0,
+          modelValue: filterText.value,
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => filterText.value = $event),
+          style: { "width": "240px" },
+          placeholder: "请输入查询条件"
+        }, null, 8, ["modelValue"])) : createCommentVNode("", true),
+        isShowTree.value ? (openBlock(), createBlock(_component_el_tree, {
+          key: 1,
           ref_key: "menuTree",
           ref: menuTree,
           style: normalizeStyle(unref(runtimeStyle)),
@@ -146,6 +186,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           "highlight-current": "",
           lazy: isLazy.value,
           "node-key": "nodeId",
+          "filter-node-method": filterNode,
           onNodeClick: handleNodeClick
         }, {
           default: withCtx(({ node, data }) => [

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

@@ -20,28 +20,34 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const titleExceedStyle = runtimeInfo.titleExceedStyle;
     const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
     let val = getVariableValue(entity, dynamicFields);
-    if (val !== void 0 && val !== null && (val + "" === "1" || val + "" === "0")) {
-      if (designProperty.value.activeValue === void 0 || designProperty.value.activeValue === null) {
-        designProperty.value.activeValue = "1";
+    if (val !== void 0 && val !== null && typeof val === "number" && (val + "" === "1" || val + "" === "0")) {
+      if (!isHasActive("activeValue")) {
+        designProperty.value.activeValue = 1;
       }
-      if (designProperty.value.inactiveValue === void 0 || designProperty.value.inactiveValue === null) {
-        designProperty.value.inactiveValue = "0";
+      if (!isHasActive("inactiveValue")) {
+        designProperty.value.inactiveValue = 0;
       }
     }
-    if (val !== void 0 && val !== null && (val + "" === "true" || val + "" === "false")) {
-      if (designProperty.value.activeValue === void 0 || designProperty.value.activeValue === null) {
-        designProperty.value.activeValue = "true";
+    if (val !== void 0 && val !== null && typeof val === "boolean") {
+      if (!isHasActive("activeValue")) {
+        designProperty.value.activeValue = true;
       }
-      if (designProperty.value.inactiveValue === void 0 || designProperty.value.inactiveValue === null) {
-        designProperty.value.inactiveValue = "false";
+      if (!isHasActive("inactiveValue")) {
+        designProperty.value.inactiveValue = false;
       }
     }
-    if (designProperty.value.activeValue === void 0 || designProperty.value.activeValue === null || designProperty.value.activeValue === "") {
+    if (!isHasActive("activeValue")) {
       designProperty.value.activeValue = true;
     }
-    if (designProperty.value.inactiveValue === void 0 || designProperty.value.inactiveValue === null || designProperty.value.inactiveValue === "") {
+    if (!isHasActive("inactiveValue")) {
       designProperty.value.inactiveValue = false;
     }
+    function isHasActive(type) {
+      if (designProperty.value[type] === void 0 || designProperty.value[type] === null || designProperty.value[type] === "") {
+        return false;
+      }
+      return true;
+    }
     const switchStyle = runtimeInfo.switchStyle;
     const dynamicModelMethod = computed({
       get() {
@@ -54,6 +60,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             if (val2 + "" === "0") {
               val2 = false;
             }
+          } else if (designProperty.value.activeValue === 1) {
+            if (val2 + "" === "true") {
+              val2 = 1;
+            }
+            if (val2 + "" === "false") {
+              val2 = 0;
+            }
           } else {
             val2 = val2 + "";
           }
@@ -69,6 +82,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             if (value + "" === "0") {
               value = false;
             }
+          } else if (designProperty.value.activeValue === 1) {
+            if (value + "" === "true") {
+              value = 1;
+            }
+            if (value + "" === "false") {
+              value = 0;
+            }
           } else {
             value = value + "";
           }
@@ -82,19 +102,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     onMounted(() => {
       nextTick(() => {
         const value = dynamicModelMethod.value;
-        handleAfterInitEvent(
+        handleAfterInitEvent(value, props.pageContext, props.configure, {
+          formItemRef: formItemRef.value,
+          componentRef: componentRef.value,
+          titleRef: titleRef.value,
           value,
-          props.pageContext,
-          props.configure,
-          {
-            formItemRef: formItemRef.value,
-            componentRef: componentRef.value,
-            titleRef: titleRef.value,
-            value,
-            entity: props.pageContext.entity.data,
-            pageData: props.pageContext.entity.page
-          }
-        );
+          entity: props.pageContext.entity.data,
+          pageData: props.pageContext.entity.page
+        });
       });
     });
     return (_ctx, _cache) => {

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

@@ -42,7 +42,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           dynamicShowFlag = false;
         } else {
           if (showConditions && showConditions.length > 0) {
-            dynamicShowFlag = caculateShowCondition(props.pageContext, props.configure, showConditions);
+            dynamicShowFlag = caculateShowCondition(props.pageContext, showConditions);
           } else {
             const state = (_a2 = props.configure.props.base) == null ? void 0 : _a2.state;
             if (state && state === "hidden") {
@@ -61,7 +61,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           const property = runtime.props ? runtime.props : {};
           property.rawSate = property.state;
           property.state = computed(() => {
-            const canEdit = caculateShowCondition(props.pageContext, props.configure, editConditions);
+            const canEdit = caculateShowCondition(props.pageContext, editConditions);
             return canEdit ? "" : "disabled";
           });
         }

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

@@ -422,17 +422,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             let dataId = isNeedId && eventParams ? eventParams.id : null;
             let ids = isNeedId && eventParams ? eventParams.ids : null;
             let selections = eventParams ? eventParams.selections : [];
-            let entity = {};
-            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);
+            let entity = eventParams ? eventParams.row : null;
+            if (!entity) {
+              entity = {};
+              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);
+                }
               }
             }
             const copyPageData = deepCopy(parentPageContext.value.entity.page);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.1.72",
+  "version": "2.1.73",
   "description": "AgileBuilder super page runtime",
   "license": "ISC",
   "main": "dist/es/index.js",