super-page-runtime 2.0.22 → 2.0.25

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

@@ -1,11 +1,12 @@
 import { defineComponent, ref, onMounted, watch, onUnmounted, resolveComponent, openBlock, createElementBlock, createVNode, unref } from "vue";
 import "agilebuilder-ui";
-import { setTableEvents, getEventFuncByType, canExecuteButton, doAfterClickEvent, doBeforeClickEvent, getHandleEvent, gridSelectRecord, gridSelectAllRecords, gridSelectionChange, cellClick, cellDblClick, rowClick, rowDblClick, headerClick } from "../../../../utils/events/event-util.js";
+import { setTableEvents, getEventFuncByType, canExecuteButton, doAfterClickEvent, getEventNameByType, doBeforeClickEvent, getHandleEvent, gridSelectRecord, gridSelectAllRecords, gridSelectionChange, cellClick, cellDblClick, rowClick, rowDblClick, headerClick } from "../../../../utils/events/event-util.js";
 import { getListCode, getRealRestApiPath } from "../../../../utils/common-util.js";
-import { getAdditionalParamMap, getSaveFormRequest, standardEvents } from "../../../../utils/events/standard-event.js";
+import { getAdditionalParamMap, getSaveFormRequestWithRow, standardEvents } from "../../../../utils/events/standard-event.js";
 import { isPromise } from "agilebuilder-ui/src/utils/common-util";
 import { getDataTypeMap, popupToPage } from "../../../../utils/table-utils.js";
 import eventBus from "../../../../utils/eventBus.js";
+import { getPermissionCodes } from "../../../../utils/page-init-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "main-table-runtime",
   props: {
@@ -22,9 +23,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const systemCode = pageContext.systemCode;
     const backendUrl = pageContext.backendUrl;
     const tableName = pageContext.tableName;
-    const baseURL = window["$vueApp"].config.globalProperties.baseURL;
-    const operationButtonObj = ref(null);
-    const eventName = ref(null);
+    let baseURL = pageContext.backendUrl;
+    if (!baseURL) {
+      baseURL = window["$vueApp"].config.globalProperties.baseURL;
+    }
+    const operationButtonObj = ref({});
     const listOptions = ref({});
     listOptions.value = getOptions();
     const gridRef = ref(null);
@@ -77,19 +80,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       eventBus.$off(eventPageInfo + "_close-dialog-get-entity");
     });
     function getUrlToListData() {
-      let urlToListData2;
-      if (!pageContext.isTest) {
-        urlToListData2 = baseURL + "/dsc/commons/list";
-        if (urlToListData2) {
-          urlToListData2 = getRealRestApiPath(urlToListData2, systemCode, backendUrl);
-        }
+      let urlToListData2 = baseURL + "/dsc/commons/list";
+      if (urlToListData2) {
+        urlToListData2 = getRealRestApiPath(urlToListData2, systemCode, backendUrl);
       }
       return urlToListData2;
     }
     function getOptions() {
       const systemCode2 = pageContext.systemCode;
-      const permissionPrefix = systemCode2 + "." + pageContext.code;
-      let initSearchForm = configure.props && configure.props.dataOrigin ? configure.props.dataOrigin.sqlFilterCondition : null;
+      const permissionPrefix = pageContext.code;
+      let initSearchForm = configure.props && configure.props.dataOrigin && configure.props.dataOrigin.sqlFilterCondition !== "[]" ? configure.props.dataOrigin.sqlFilterCondition : null;
       if (typeof initSearchForm === "undefined" || initSearchForm === null) {
         initSearchForm = [];
       }
@@ -99,8 +99,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           beanName: pageContext.beanName,
           functionCode: permissionPrefix + ".list",
           tableName,
-          systemCode: systemCode2
+          systemCode: systemCode2,
           // 系统编码传给列表数据后台请求
+          pageCode: pageContext.code,
+          pageVersion: pageContext.version
         },
         initSearchForm,
         lineEditOptions: {
@@ -130,8 +132,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         pageContext,
         configureObj: configure
       };
+      setOperationButtons(options);
       setSortInfo(options);
-      myGetDataTypeMap(options);
+      myGetDataTypeMap();
       setTreeSetting(options);
       setGridEvents(options);
       return options;
@@ -153,32 +156,37 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return;
       }
       getDataTypeMap(backendUrl, tableName).then((result) => {
+        if (!pageContext["dataTypeMaps"]) {
+          pageContext["dataTypeMaps"] = {};
+        }
         pageContext["dataTypeMaps"][tableName] = result["dataTypeMap"];
-        setOperationButtons(options);
       });
     }
     function setOperationButtons(options) {
       const showOperation = configure.props && configure.props.base ? configure.props.base.showOperation : false;
-      const operationButtons = configure.btnList;
-      if (showOperation && operationButtons) {
-        const operationButtons2 = [];
-        operationButtons2.forEach((buttonConfigure) => {
+      const operationButtonSettings = configure.btnList;
+      console.log("configure.btnList===", configure.btnList, "configure====", configure);
+      if (showOperation && operationButtonSettings) {
+        const operationButtons = [];
+        operationButtonSettings.forEach((buttonConfigure) => {
           const myButtonSet = {};
           const myButtonProps = Object.assign({}, buttonConfigure.props.base);
           myButtonProps.elementType = "el-button";
           if (buttonConfigure.isPermission === void 0 || buttonConfigure.isPermission + "" === "true") {
-            if (buttonConfigure.functionCode) {
-              myButtonProps.permission = buttonConfigure.functionCode;
+            const functionCodes = getPermissionCodes(buttonConfigure, props.pageContext);
+            if (functionCodes) {
+              myButtonProps.permission = functionCodes;
             }
           }
+          myButtonProps.label = myButtonProps.title;
           myButtonSet["props"] = myButtonProps;
           myButtonSet["onClick"] = getOperationButtonClickEvent(buttonConfigure);
-          operationButtons2.push(myButtonSet);
+          operationButtons.push(myButtonSet);
         });
         if (!options.operations) {
           options.operations = {};
         }
-        options.operations.operation = operationButtons2;
+        options.operations.operation = operationButtons;
       }
     }
     function setTreeSetting(options) {
@@ -227,11 +235,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       }
     }
-    function enterSave(rowIndex, column, row, orgRow) {
+    function enterSave({ rowIndex, column, row, orgRow }) {
       saveRow(null, null, row, column, rowIndex);
     }
     function saveRow(originalValue, formatValue, row, column, rowIndex) {
-      const buttonConfigure = operationButtonObj.value[eventName.value];
+      const buttonConfigure = operationButtonObj.value["lineEditSave"];
+      const tableConfigure = configure;
+      buttonConfigure.props.base.tableUuid = tableConfigure.uuid;
       listOptions.value["lineEditOptions"]["beforeSave"] = beforeSaveRow;
       pageContext.editData = row;
       canExecuteButton({ pageContext, configureObj: buttonConfigure }).then((result) => {
@@ -254,46 +264,61 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function getOperationButtonClickEvent(buttonConfigure) {
       let onClick;
-      eventName.value = buttonConfigure.eventName;
-      operationButtonObj.value[eventName.value] = buttonConfigure;
-      if (eventName.value === "lineEditSave") {
-        onClick = saveRow;
-      } else if (eventName.value === "restoreEdit") {
-        onClick = restoreRow;
-      } else if (eventName.value === "lineEditUpdate") {
-        onClick = editRow;
-      } else if (eventName.value === "lineEditDelete") {
-        onClick = deleteRow;
-      } else {
-        onClick = customButtonClick;
-      }
-      if (!onClick) {
-        onClick = function() {
-        };
+      const eventName = getEventNameByType(buttonConfigure.events, "click");
+      if (eventName) {
+        operationButtonObj.value[eventName] = buttonConfigure;
+        if (eventName === "lineEditSave") {
+          onClick = saveRow;
+        } else if (eventName === "restoreEdit") {
+          onClick = restoreRow;
+        } else if (eventName === "lineEditUpdate") {
+          onClick = editRow;
+        } else if (eventName === "lineEditDelete") {
+          onClick = deleteRow;
+        } else {
+          onClick = customButtonClick;
+        }
+        if (!onClick) {
+          onClick = function() {
+          };
+        }
       }
       return onClick;
     }
-    function beforeSaveRow(row, columns, dataTypeMap, dynamicColumnInfo, additionalParamMap, mainDefaultValueColumns) {
-      const buttonConfigure = operationButtonObj.value[eventName.value];
+    function beforeSaveRow({
+      row,
+      columns,
+      additionalParamMap
+    }) {
+      const buttonConfigure = operationButtonObj.value["lineEditSave"];
+      const tableConfigure = configure;
+      buttonConfigure.props.base.tableUuid = tableConfigure.uuid;
       const otherParams = {
-        dynamicColumnInfo,
-        mainDefaultValueColumns,
-        dataTypeMap,
         row,
         columns
       };
       return doBeforeClickEvent(pageContext, buttonConfigure, otherParams);
     }
-    function saveLineEditRow(row, columns, dataTypeMap, dynamicColumnInfo, additionalParamMap, mainDefaultValueColumns) {
-      const buttonConfigure = operationButtonObj.value[eventName.value];
+    function saveLineEditRow({
+      row,
+      columns,
+      dataTypeMap,
+      dynamicColumnInfo,
+      additionalParamMap,
+      mainDefaultValueColumns
+    }) {
+      const buttonConfigure = operationButtonObj.value["lineEditSave"];
+      const tableConfigure = configure;
+      buttonConfigure.props.base.tableUuid = tableConfigure.uuid;
       return new Promise((resolve, reject) => {
-        getSaveFormRequest(
+        getSaveFormRequestWithRow(
           pageContext,
           buttonConfigure,
           "/dsc/commons",
           false,
           mainDefaultValueColumns,
-          dynamicColumnInfo
+          dynamicColumnInfo,
+          row
         ).then((commonEntity) => {
           if (commonEntity) {
             resolve(commonEntity.entity);
@@ -305,11 +330,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         });
       });
     }
-    function escRestorRow(rowIndex, column, row, orgRow) {
+    function escRestorRow({ rowIndex, column, row, orgRow }) {
       restoreRow(null, null, row, column, rowIndex);
     }
     function restoreRow(originalValue, formatValue, row, column, rowIndex) {
-      const buttonConfigure = operationButtonObj.value[eventName.value];
+      const buttonConfigure = operationButtonObj.value["restoreEdit"];
+      const tableConfigure = configure;
+      buttonConfigure.props.base.tableUuid = tableConfigure.uuid;
       const otherParams = {
         originalValue,
         formatValue,
@@ -340,7 +367,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       doAfterClickEvent(pageContext, configure, afterOtherParams);
     }
     function editRow(originalValue, formatValue, row, column, rowIndex) {
-      const buttonConfigure = operationButtonObj.value[eventName.value];
+      const buttonConfigure = operationButtonObj.value["lineEditUpdate"];
+      const tableConfigure = configure;
+      buttonConfigure.props.base.tableUuid = tableConfigure.uuid;
       const otherParams = {
         originalValue,
         formatValue,
@@ -381,7 +410,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       });
     }
     function deleteRow(originalValue, formatValue, row, column, rowIndex) {
-      const buttonConfigure = operationButtonObj.value[eventName.value];
+      const buttonConfigure = operationButtonObj.value["lineEditDelete"];
+      const tableConfigure = configure;
+      buttonConfigure.props.base.tableUuid = tableConfigure.uuid;
       const otherParams = {
         originalValue,
         formatValue,
@@ -417,8 +448,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             standardEvents.delete({
               pageContext,
               configureObj: buttonConfigure,
-              ids,
-              tableUuid: listCode
+              ids
             });
           }
         }).finally(() => {
@@ -500,7 +530,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         rowIndex,
         button
       };
-      const buttonConfigure = operationButtonObj.value[eventName.value];
+      const buttonConfigure = operationButtonObj.value["xxx"];
+      const tableConfigure = configure;
+      buttonConfigure.props.base.tableUuid = tableConfigure.uuid;
       getHandleEvent(null, pageContext, buttonConfigure, "click", otherParams);
     }
     function recieveMessage(event) {
@@ -618,7 +650,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ref: gridRef,
           url: unref(urlToListData),
           options: listOptions.value,
-          code: unref(superGridSetting) ? null : unref(listCode),
+          code: unref(listCode),
           settings: unref(superGridSetting),
           "search-form-info": searchFormInfo.value,
           "list-toolbar-form-data": unref(listToolbarFormData),

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

@@ -425,7 +425,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ref: gridRef,
           url: unref(baseURL) + "/common/super-forms/sub-table",
           options: listViewOptions.value,
-          code: unref(superGridSetting) ? null : unref(listCode),
+          code: unref(listCode),
           settings: unref(superGridSetting),
           onSelect: select,
           onSelectAll: selectAll,

package/dist/es/components/runtime/views/assemblys/form/input-text/inputtext-runtime.vue2.js

@@ -1,8 +1,9 @@
-import { defineComponent, computed, ref, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, createVNode, createSlots, createTextVNode } from "vue";
+import { defineComponent, computed, ref, watch, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, createVNode, createSlots, createTextVNode } from "vue";
 import { SuperIcon } from "agilebuilder-ui";
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
 import { getVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
 import { handleEvent } from "../../../../utils/events/event-util.js";
+import { formatScanRuleSets, analysisScanValue, setScanAnalysisValue } from "../../../../utils/form/scan-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "inputtext-runtime",
   props: {
@@ -10,6 +11,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     configure: {}
   },
   setup(__props, { expose: __expose }) {
+    var _a, _b;
     const props = __props;
     const entity = props.pageContext.entity ? props.pageContext.entity : {};
     let dynamicFields = getFormModelFields(props.pageContext, props.configure);
@@ -23,6 +25,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
     const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
+    let scanRuleSets = {};
+    if (((_a = designProperty.value.scan) == null ? void 0 : _a.enable) && ((_b = designProperty.value.scan.ruleList) == null ? void 0 : _b.length) > 0) {
+      setScanRuleSets();
+      watchScanValueChange();
+    }
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
     const headerStyle = runtimeInfo.headerStyle;
@@ -32,6 +39,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function setValue(value) {
       return setVariableValue(entity, dynamicFields, value);
     }
+    function setScanRuleSets() {
+      formatScanRuleSets(designProperty.value.scan.ruleList).then((res) => {
+        scanRuleSets = res;
+      });
+    }
+    function watchScanValueChange() {
+      watch(
+        () => dynamicModelMethod.value,
+        (newValue) => {
+          const valueSet = analysisScanValue(newValue, scanRuleSets);
+          if (valueSet) {
+            setScanAnalysisValue(props.pageContext, valueSet.scanSet, valueSet.params);
+          }
+        }
+      );
+    }
     __expose({
       getValue,
       setValue

package/dist/es/components/runtime/views/assemblys/form/rich-text/richtext-runtime.vue2.js

@@ -26,7 +26,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeClass = runtimeInfo.class;
     const headerStyle = runtimeInfo.headerStyle;
     const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
-    let contentVariable = designProperty.value;
+    let contentVariable = designProperty.value.value;
     const initValue = formatVariableValue(props.pageContext, contentVariable);
     const quillEditorRef = ref(null);
     const quill = ref(null);
@@ -79,6 +79,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       placeholder: designProperty.value.placeholder,
       readOnly: designProperty.value.state == "readonly"
     });
+    function updateEditorHeight() {
+      if (quill.value && quill.value) {
+        if (quill.value.container) {
+          const parentNode = quill.value.container.parentNode;
+          const parentRect = parentNode.getBoundingClientRect();
+          const thisRect = quill.value.container.getBoundingClientRect();
+          let newHeight = parentRect.height - (thisRect.top - parentRect.top);
+          if (newHeight < 100) {
+            newHeight = 100;
+          }
+          quill.value.container.style.height = newHeight + "px";
+        }
+      }
+    }
     const handleUpload = (e) => {
       const files = Array.prototype.slice.call(e.target.files);
       if (!files) {
@@ -123,7 +137,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
         setVariableValue(entity, dynamicFields, quill.value.root.innerHTML);
       });
-      updateEditorHeibusght();
+      updateEditorHeight();
     });
     onBeforeUnmount(() => {
       if (quillEditorRef.value) {
@@ -146,8 +160,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           "Content-Type": "multipart/form-data"
         }
       };
+      let baseUrl = props.pageContext.backendUrl;
+      if (!baseUrl) {
+        baseUrl = window["$vueApp"].config.globalProperties.baseURL;
+      }
       return http.post(
-        window.$vueApp.config.globalProperties.baseURL + "/common/fs-upload/rich-editor-image",
+        baseUrl + "/common/fs-upload/rich-editor-image",
         params,
         config
       );

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

@@ -17,6 +17,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       props.configure.style = {};
     }
     const permissionCodes = getPermissionCodes(props.configure, props.pageContext);
+    if (props.configure && props.configure.props && props.configure.props.base) {
+      props.configure.props.base.functionCode = permissionCodes;
+    }
     packageFormRules(props.pageContext, props.configure);
     let handleShowFlag = ref(true);
     let showFlag = ref(true);

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

@@ -3,7 +3,7 @@ import _sfc_main$1 from "./assemblys/object-render.vue.js";
 import { updateOptionDatasources, updateChartDatasources } from "../utils/page-helper-util.js";
 import { queryPageSuperGrids, queryPageDesignByCode, convertToPageContext } from "../utils/page-init-util.js";
 import { addComponentRef, removePageAllRef, initComponentRefState } from "../utils/global-refs.js";
-import { removeCustomFuncFromWindow, initPageEvents, handleEvent } from "../utils/events/event-util.js";
+import { removeCustomFuncFromWindow, handleEvent, initPageEvents } from "../utils/events/event-util.js";
 import _sfc_main$2 from "./assemblys/common/export-form-report-dialog.vue.js";
 import _sfc_main$3 from "./assemblys/common/task-informition-dialog.vue.js";
 import _sfc_main$4 from "./assemblys/common/remove-signer-dialog.vue.js";
@@ -175,9 +175,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         parentEventParams.value = params.eventParams;
         openDialog(parentConfigureObj.value);
       });
-      eventBus.$on(eventPageInfo.value + "close-dialog", ({ isNeedValueMapping, dataModel, sourceTableName }) => {
-        closeDialog({ isNeedValueMapping, dataModel, sourceTableName });
-      });
+      eventBus.$on(
+        eventPageInfo.value + "close-dialog",
+        ({ isNeedValueMapping, dataModel, sourceTableName }) => {
+          closeDialog({ isNeedValueMapping, dataModel, sourceTableName });
+        }
+      );
       getFormData(pageContext.value);
       watch(
         () => pageContext.value.isRefresh,
@@ -268,6 +271,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       eventBus.$off(eventPageInfo.value + "choose-return-node");
       eventBus.$off(eventPageInfo.value + "remove-signer");
       eventBus.$off(eventPageInfo.value + "prohibit-edit");
+      if (pageContext.value) {
+        handleEvent(null, pageContext.value, pageContext.value, "onUnmounted");
+      }
     });
     function closeExportFormDialog() {
       showExportForm.value = false;
@@ -376,7 +382,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function closeDialog({ isNeedValueMapping, dataModel, sourceTableName }) {
       if (isNeedValueMapping) {
-        updateValuesWhenCloseDialog(parentPageContext.value, parentConfigureObj.value, dataModel, sourceTableName);
+        updateValuesWhenCloseDialog(
+          parentPageContext.value,
+          parentConfigureObj.value,
+          dataModel,
+          sourceTableName
+        );
       }
       parentPageContext.value = null;
       parentConfigureObj.value = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.0.22",
+  "version": "2.0.25",
   "description": "AgileBuilder super page runtime",
   "license": "ISC",
   "main": "dist/es/index.js",
@@ -47,7 +47,7 @@
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "@vue/eslint-config-prettier": "^8.0.0",
     "@vue/test-utils": "^2.4.4",
-    "agilebuilder-ui": "1.0.18",
+    "agilebuilder-ui": "1.0.19",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",