super-page-runtime 2.1.50 → 2.1.57

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

@@ -45,8 +45,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return value;
       }
       if (formatStr) {
-        console.log("formatStr", formatStr);
-        console.log("before", value);
         try {
           const convertValue = dayjs(value);
           let value2 = null;
@@ -55,7 +53,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           } else {
             value2 = dayjs(value).format(formatStr);
           }
-          console.log("after", value2);
           return value2;
         } catch (e) {
           console.error("日期值格式化错误", e);

package/dist/es/components/runtime/views/assemblys/form/file-upload/fileupload-runtime.vue2.js

@@ -24,9 +24,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const pathFields = getFieldsByVariable(propsBase.prop);
     const nameFields = getFieldsByVariable(propsBase.propName);
     const pageCode = props.pageContext.code;
-    console.log("pathFields-----", pathFields, "pageCode=", pageCode, "propsBase.prop=", propsBase.prop);
     const componentId = ref(pathFields ? pageCode + "__" + pathFields.join("__") : null);
-    console.log("componentId-----", componentId.value);
     const initPaths = getVariableValue(entity, pathFields);
     const fileUploadRef = ref(null);
     const fileList = ref([]);

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

@@ -21,23 +21,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     let dynamicFields = getFormModelFields(props.pageContext, props.configure);
     const isMobile = ref(isMobileBrowser());
     const pageCode = props.pageContext.code;
-    console.log(
-      "pathFields-----",
-      dynamicFields,
-      "pageCode=",
-      pageCode,
-      "props.configure=",
-      props.configure
-    );
     const componentId = ref(
       dynamicFields && dynamicFields.length > 0 ? pageCode + "__" + dynamicFields.join("__") : null
     );
-    console.log("componentId-----", componentId.value);
     const dynamicModelMethod = computed({
       get() {
         return getVariableValue(entity, dynamicFields);
       },
       set(value) {
+        value = value.trim();
         setVariableValue(entity, dynamicFields, value);
       }
     });
@@ -65,11 +57,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     } else {
       userAgent = "browser";
     }
-    console.log("window.location.protocol---", window.location.protocol);
+    const isApk = isMobile.value && userAgent && userAgent === "app" ? true : false;
     const isShowScanIcon = ref(
-      isMobile.value && scanEnable.value && window.location.protocol === "https:" ? true : false
+      isApk && scanEnable.value || isMobile.value && scanEnable.value && window.location.protocol === "https:" ? true : false
     );
-    const isApk = isMobile.value && userAgent && userAgent === "app" ? true : false;
     let scanRuleSets = {};
     if (((_b = designProperty.value.scan) == null ? void 0 : _b.enable) && ((_c = designProperty.value.scan.ruleList) == null ? void 0 : _c.length) > 0) {
       setScanRuleSets();

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, watch, onMounted, onBeforeUnmount, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, createElementVNode } from "vue";
+import { defineComponent, ref, watch, onMounted, onBeforeUnmount, resolveComponent, openBlock, createElementBlock, Fragment, createBlock, normalizeClass, unref, normalizeStyle, withCtx, toDisplayString, createCommentVNode, createElementVNode } from "vue";
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
 import { formatVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
 import Quill from "quill";
@@ -6,6 +6,7 @@ import "quill/dist/quill.snow.css";
 import { handleFormEvent } from "../../../../utils/events/event-util.js";
 import http from "agilebuilder-ui/src/utils/request";
 import { $t } from "../../../../utils/i18n-util.js";
+import { getToken } from "agilebuilder-ui/src/utils/auth";
 const _hoisted_1 = { style: { "width": "100%", "height": "100%" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "richtext-runtime",
@@ -104,6 +105,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         quill.container.style.height = newHeight + "px";
       }
     }
+    const previewList = ref([]);
+    const showViewer = ref(false);
     onMounted(() => {
       var _a;
       quill = new Quill(quillEditorRef.value, option.value);
@@ -129,7 +132,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   for (let i2 = 0; i2 < images.length; i2++) {
                     const img = images[i2];
                     if (img.src === dataurl) {
-                      img.src = res.url;
+                      img.src = res.url + "&jwt=" + getToken();
                     }
                   }
                 }
@@ -141,6 +144,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
         setVariableValue(entity, dynamicFields, quill.root.innerHTML);
       });
+      const editorContainer = quill.container;
+      editorContainer.addEventListener("click", function(event) {
+        if (event.target.localName === "img") {
+          previewList.value = [];
+          let imgSrc = event.target.src;
+          previewList.value.push(imgSrc);
+          showViewer.value = true;
+        }
+      });
       updateEditorHeight();
     });
     onBeforeUnmount(() => {
@@ -181,30 +193,41 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     return (_ctx, _cache) => {
       const _component_el_form_item = resolveComponent("el-form-item");
-      return designProperty.value.tittleShow ? (openBlock(), createBlock(_component_el_form_item, {
-        key: 0,
-        required: designProperty.value.required,
-        class: normalizeClass(unref(runtimeClass)),
-        "label-width": designProperty.value.labelWidth,
-        style: normalizeStyle(unref(runtimeStyle))
-      }, {
-        label: withCtx(() => [
-          designProperty.value.tittleShow ? (openBlock(), createElementBlock("div", {
-            key: 0,
-            style: normalizeStyle({ ...unref(headerStyle), ...unref(titleExceedStyle) })
-          }, toDisplayString(unref($t)(designProperty.value.title)), 5)) : createCommentVNode("", true)
-        ]),
-        default: withCtx(() => [
-          createElementVNode("div", _hoisted_1, [
-            createElementVNode("div", {
-              ref_key: "quillEditorRef",
-              ref: quillEditorRef,
-              style: { "width": "100%" }
-            }, null, 512)
-          ])
-        ]),
-        _: 1
-      }, 8, ["required", "class", "label-width", "style"])) : createCommentVNode("", true);
+      const _component_el_image_viewer = resolveComponent("el-image-viewer");
+      return openBlock(), createElementBlock(Fragment, null, [
+        designProperty.value.tittleShow ? (openBlock(), createBlock(_component_el_form_item, {
+          key: 0,
+          required: designProperty.value.required,
+          class: normalizeClass(unref(runtimeClass)),
+          "label-width": designProperty.value.labelWidth,
+          style: normalizeStyle(unref(runtimeStyle))
+        }, {
+          label: withCtx(() => [
+            designProperty.value.tittleShow ? (openBlock(), createElementBlock("div", {
+              key: 0,
+              style: normalizeStyle({ ...unref(headerStyle), ...unref(titleExceedStyle) })
+            }, toDisplayString(unref($t)(designProperty.value.title)), 5)) : createCommentVNode("", true)
+          ]),
+          default: withCtx(() => [
+            createElementVNode("div", _hoisted_1, [
+              createElementVNode("div", {
+                ref_key: "quillEditorRef",
+                ref: quillEditorRef,
+                style: { "width": "100%" }
+              }, null, 512)
+            ])
+          ]),
+          _: 1
+        }, 8, ["required", "class", "label-width", "style"])) : createCommentVNode("", true),
+        showViewer.value ? (openBlock(), createBlock(_component_el_image_viewer, {
+          key: 1,
+          "hide-on-click-modal": "",
+          onClose: _cache[0] || (_cache[0] = () => {
+            showViewer.value = false;
+          }),
+          "url-list": previewList.value
+        }, null, 8, ["url-list"])) : createCommentVNode("", true)
+      ], 64);
     };
   }
 });

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

@@ -1,4 +1,4 @@
-import { defineComponent, computed, ref, watch, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, Fragment, createTextVNode, toDisplayString, createCommentVNode, createVNode, renderList, createElementVNode } from "vue";
+import { defineComponent, ref, computed, watch, onMounted, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, Fragment, createTextVNode, toDisplayString, createCommentVNode, createVNode, renderList, createElementVNode } from "vue";
 import { getVariableValue, setVariableValue, getOptionDatasFromPage, queryOptionDatasources, autoSetAfterSelect } from "../../../../utils/page-helper-util.js";
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
 import { handleFormEvent } from "../../../../utils/events/event-util.js";
@@ -16,33 +16,39 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const props = __props;
     const entity = props.pageContext.entity ? props.pageContext.entity : {};
     let dynamicFields = getFormModelFields(props.pageContext, props.configure);
+    const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
+    const runtimeStyle = runtimeInfo.style;
+    const runtimeClass = runtimeInfo.class;
+    const headerStyle = runtimeInfo.headerStyle;
+    const titleExceedStyle = runtimeInfo.titleExceedStyle;
+    const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
     const dynamicModelMethod = computed({
       get() {
         let val = getVariableValue(entity, dynamicFields);
-        console.log("select组件----dynamicModelMethod---get-111-val", val);
         if (val !== void 0 && val !== null) {
           val = val + "";
         }
-        console.log("select组件----dynamicModelMethod---get222--val", val);
+        if (designProperty.value.multiple) {
+          if (val) {
+            val = val.split(",");
+          }
+        }
         return val;
       },
       set(value) {
-        console.log("select组件----dynamicModelMethod---set--value", value);
+        if (designProperty.value.multiple) {
+          if (value && value.length > 0) {
+            value = value.join(",");
+          }
+        }
         setVariableValue(entity, dynamicFields, value);
       }
     });
-    const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
-    const runtimeStyle = runtimeInfo.style;
-    const runtimeClass = runtimeInfo.class;
-    const headerStyle = runtimeInfo.headerStyle;
-    const titleExceedStyle = runtimeInfo.titleExceedStyle;
-    const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
     const listOptions = ref(designProperty.value.options ? designProperty.value.options : []);
     const cacheOptions = getOptionDatasFromPage(props.pageContext, props.configure);
     if (cacheOptions.length > 0) {
       listOptions.value = cacheOptions;
     }
-    console.log("select组件----listOptions.value=", listOptions.value);
     const queryLoadingFlag = ref(false);
     const dataOrigin = props.configure.props && props.configure.props.dataOrigin ? props.configure.props.dataOrigin : {};
     const valueType = dataOrigin.optionValueSetType;
@@ -153,8 +159,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function updateOptions(newOptions) {
       listOptions.value = newOptions ? newOptions : [];
-      console.log("updateOptions", newOptions);
     }
+    onMounted(() => {
+    });
     __expose({
       updateOptions
     });

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

@@ -14,13 +14,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     configure: {}
   },
   setup(__props) {
-    var _a;
+    var _a, _b;
     const props = __props;
     if (props.configure.style == void 0) {
       props.configure.style = {};
     }
     const permissionCodes = getPermissionCodes(props.configure, props.pageContext);
-    console.log("Object-Render---permissionCodes=", permissionCodes);
     if (props.configure && props.configure.props && props.configure.props.base) {
       props.configure.props.base.functionCode = permissionCodes;
     }
@@ -51,13 +50,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }
           }
         }
-        console.log("obj-render-dynamicShowFlag", dynamicShowFlag);
         return dynamicShowFlag;
       });
       const propConfigure = props.configure;
       propConfigure._dynamicShowFlag = showFlag;
-      if (props.configure.props.editConditions) {
-        const editConditions = props.configure.props.editConditions;
+      if ((_b = props.configure.props.base) == null ? void 0 : _b.editConditions) {
+        const editConditions = props.configure.props.base.editConditions;
         if (editConditions.length > 0) {
           const runtime = props.configure.runtime ? props.configure.runtime : {};
           const property = runtime.props ? runtime.props : {};

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, packageAdditionalMapWithRoute } from "../utils/page-init-util.js";
 import { addComponentRef, removePageAllRef, initComponentRefState } from "../utils/global-refs.js";
-import { removeCustomFuncFromWindow, handleEvent, initPageEvents } from "../utils/events/event-util.js";
+import { removeCustomFuncFromWindow, handleEvent, initPageEvents, getCustomFunc } 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";
@@ -17,10 +17,11 @@ import { i18nValidateRulesMessage } from "../utils/events/validator-util.js";
 import _sfc_main$5 from "./super-page-dialog.vue.js";
 import { useRoute, useRouter } from "vue-router";
 import { jumpToPage } from "agilebuilder-ui/src/utils/jump-page-utils";
-import { setSessionCache } from "agilebuilder-ui/src/utils/auth";
+import { setSessionCache, getUsername } from "agilebuilder-ui/src/utils/auth";
 import { deepCopy, isNumber, refreshMobileDialogType } from "../utils/common-util.js";
 import { isMobileBrowser } from "agilebuilder-ui/src/utils/common-util";
 import { usePageContextStore } from "../utils/page-store.js";
+import imatrixUiStore from "agilebuilder-ui/src/store";
 const _hoisted_1 = { class: "app-container" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "super-page",
@@ -236,7 +237,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       pageContext2.initChartData = {};
       pageContext2.initChartData.data = deepCopy(pageContext2.entity.data);
       pageContext2.initChartData.page = deepCopy(pageContext2.entity.page);
-      console.log("pageContext.chartConfigs:", chartConfigs);
       if (chartConfigs && chartConfigs.length > 0) {
         updateChartDatasources(pageContext2, chartConfigs, null, true);
       }
@@ -271,8 +271,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         setTimeout(() => {
           initPageDesign(props.pageDesign).then(() => {
             if (props.pageDesign.tableRuntimes && Object.keys(props.pageDesign.tableRuntimes).length > 0) {
-              queryPageSuperGrids(props.pageDesign, pageContext.value, props.publishVersion).then((superGridItems) => {
-                pageContext.value.superGridItems = superGridItems;
+              queryPageSuperGrids(props.pageDesign, pageContext.value, props.publishVersion).then((result) => {
+                pageContext.value.isWorkflowEntity = result.isWorkflowEntity;
+                pageContext.value.dataTypeMaps = result.dataTypeMaps;
+                pageContext.value.superGridItems = result.superGrids;
               }).catch((error) => {
                 console.log("queryPageSuperGrids error", error);
               }).finally(() => {
@@ -443,6 +445,27 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       });
     }
+    function getCurrentUserPermissionsWhenPopPageDiff(popPageSetting, jumpMode) {
+      const loginName = getUsername();
+      return new Promise((resolve, reject) => {
+        if (loginName) {
+          debugger;
+          if ((jumpMode === "popup" || isMobile) && parentPageContext.value.systemCode !== popPageSetting.customSystem) {
+            const systemCode = popPageSetting.customSystem;
+            imatrixUiStore.dispatch("getCurrentUserPermissions", { loginName, systemCode }).then(() => {
+              resolve(true);
+            }).catch(() => {
+              console.log("获得用户权限失败");
+              resolve(true);
+            });
+          } else {
+            resolve(true);
+          }
+        } else {
+          resolve(true);
+        }
+      });
+    }
     const router = useRouter();
     function openDialog(configureObj, eventParams, myJumpPageSetting) {
       getPopPageSetting(configureObj, eventParams, myJumpPageSetting).then((openPageParams) => {
@@ -469,31 +492,32 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           popPageSetting.isNewPage = true;
           if (jumpMode === "popup" || jumpMode === "refresh") {
             const linkType = popPageSetting.linkType;
-            if (isMobile && (parentPageContext.value.systemCode !== popPageSetting.customSystem || linkType && linkType === "url")) {
-              popPageSetting._isIframe = true;
-              if (jumpMode === "refresh") {
-                popPageSetting.dialogType = "drawer";
-                popPageSetting.jumpPageWidth = "100%";
-              }
-              jumpPageSetting.value = popPageSetting;
-              isShowDialog.value = true;
-            } else {
-              popPageSetting._isIframe = false;
-              if (jumpMode === "popup" || isMobile && jumpMode === "refresh") {
+            getCurrentUserPermissionsWhenPopPageDiff(popPageSetting, jumpMode).then(() => {
+              if (isMobile && (parentPageContext.value.systemCode !== popPageSetting.customSystem || linkType && linkType === "url")) {
+                popPageSetting._isIframe = true;
                 if (jumpMode === "refresh") {
                   popPageSetting.dialogType = "drawer";
                   popPageSetting.jumpPageWidth = "100%";
                 }
-                debugger;
                 jumpPageSetting.value = popPageSetting;
                 isShowDialog.value = true;
-              } else if (jumpMode === "refresh") {
-                router.push({
-                  path: "/dsc/page",
-                  query: popPageSetting
-                });
+              } else {
+                popPageSetting._isIframe = false;
+                if (jumpMode === "popup" || isMobile && jumpMode === "refresh") {
+                  if (jumpMode === "refresh") {
+                    popPageSetting.dialogType = "drawer";
+                    popPageSetting.jumpPageWidth = "100%";
+                  }
+                  jumpPageSetting.value = popPageSetting;
+                  isShowDialog.value = true;
+                } else if (jumpMode === "refresh") {
+                  router.push({
+                    path: "/dsc/page",
+                    query: popPageSetting
+                  });
+                }
               }
-            }
+            });
             eventBus.$on(eventPageInfo.value + "close-dialog", (params) => {
               closeFunc(params);
             });
@@ -504,6 +528,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       });
     }
     function closeFunc(params) {
+      debugger;
       const jumpMode = params.jumpMode;
       if (jumpMode && jumpMode === "popup" || isMobile && jumpMode === "refresh") {
         closeDialog(params);
@@ -512,6 +537,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     function closeDialog(params) {
+      debugger;
+      const closeEventName = jumpPageSetting.value.closeEvent;
+      const isRefreshWhenClosePopup = jumpPageSetting.value.isRefreshWhenClosePopup;
       let dataModel;
       let sourceTableName;
       if (params) {
@@ -528,20 +556,54 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       }
       const targetTableName = parentPageContext.value.tableName;
-      handleEvent(null, parentPageContext.value, parentConfigureObj.value, "closePopup", {
+      let currentParentConfigureObj;
+      const columnProp = parentEventParams.value.columnProp ? parentEventParams.value.columnProp : null;
+      if (columnProp) {
+        const columnConfigures = parentConfigureObj.value.items.filter(
+          (column) => {
+            var _a, _b, _c, _d;
+            return ((_b = (_a = column.props) == null ? void 0 : _a.base) == null ? void 0 : _b.prop) && ((_d = (_c = column.props) == null ? void 0 : _c.base) == null ? void 0 : _d.prop) === columnProp;
+          }
+        );
+        currentParentConfigureObj = columnConfigures && columnConfigures.length > 0 ? columnConfigures[0] : null;
+      } else {
+        currentParentConfigureObj = parentConfigureObj.value;
+      }
+      handleEvent(null, parentPageContext.value, currentParentConfigureObj, "closePopup", {
         sourceModel: dataModel,
         sourceTableName,
         jumpPageSetting,
         entity: parentPageContext.value.entity.data,
-        targetTableName
+        targetTableName,
+        pageContext: pageContext.value,
+        parentPageContext: parentPageContext.value,
+        parentConfigureObj: currentParentConfigureObj,
+        columnProp
       });
-      refreshFormOrListPage(parentPageContext.value, parentConfigureObj.value);
+      handleCloseDialogEvent(closeEventName, columnProp, currentParentConfigureObj);
+      refreshFormOrListPage(parentPageContext.value, parentConfigureObj.value, isRefreshWhenClosePopup);
       parentPageContext.value = null;
       parentConfigureObj.value = null;
       parentEventParams.value = null;
       eventBus.$off(eventPageInfo.value + "close-dialog");
       isShowDialog.value = false;
     }
+    function handleCloseDialogEvent(closeEventName, columnProp, currentParentConfigureObj) {
+      if (closeEventName) {
+        const func = getCustomFunc(parentPageContext.value, closeEventName);
+        if (func) {
+          func.apply(func, [
+            {
+              pageContext: pageContext.value,
+              parentPageContext: parentPageContext.value,
+              parentConfigureObj: currentParentConfigureObj,
+              jumpPageSetting,
+              columnProp
+            }
+          ]);
+        }
+      }
+    }
     function pickFileDone(data) {
       let componentId = data.componentId;
       let listCode = data.listCode;

package/package.json

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