cloud-web-corejs 1.0.253 → 1.0.255

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.253",
+  "version": "1.0.255",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/wf/mixins/setCandidateDialog.js

@@ -42,7 +42,7 @@ moudule = {
     confirmWfTaskUserRangeDialog(rows){
       let $grid = this.$refs["table-m1"];
       let item = $grid.getTableData().fullData[this.operateIndex];
-      let wfTaskCandidateDTOs = item.wfTaskCandidateDTOs;
+      let wfTaskCandidateDTOs = item.wfTaskCandidateDTOs || [];
       let item1s = [];
       let item2s = []
       rows.forEach(row => {
@@ -169,7 +169,7 @@ moudule = {
     userConfirm(rows) {
       let $grid = this.$refs["table-m1"];
       let item = $grid.getTableData().fullData[this.operateIndex];
-      let wfTaskCandidateDTOs = item.wfTaskCandidateDTOs;
+      let wfTaskCandidateDTOs = item.wfTaskCandidateDTOs || [];
       let item1s = [];
       let item2s = []
       rows.forEach(row => {

package/src/components/xform/form-designer/form-widget/field-widget/baseAttachment-widget.vue

@@ -135,6 +135,7 @@ export default {
       this.option = {
         title: '附件',
         edit: !this.field.options.disabled,
+        showViewButton: this.field.options.showViewButton !== false,
         uploadConfig: {
           limit: this.field.options.limit,
           resultType: "Array"

package/src/components/xform/form-designer/setting-panel/property-editor/showViewButton-editor.vue

@@ -0,0 +1,29 @@
+<template>
+  <el-form-item :label="i18nt('隐藏查看附件按钮')">
+    <el-switch :value="hideViewButton" @change="handleChange"></el-switch>
+  </el-form-item>
+</template>
+
+<script>
+import i18n from "../../../../../components/xform/utils/i18n";
+
+export default {
+  name: "showViewButton-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  computed: {
+    hideViewButton() {
+      return this.optionModel.showViewButton === false;
+    },
+  },
+  methods: {
+    handleChange(hidden) {
+      this.$set(this.optionModel, "showViewButton", !hidden);
+    },
+  },
+};
+</script>

package/src/components/xform/form-designer/setting-panel/propertyRegister.js

@@ -170,7 +170,8 @@ const COMMON_PROPERTIES = {
   "autoValueEnabled": "autoValueEnabled-editor",
   // "commonAttributeEnabled": "commonAttributeEnabled-editor"
   "colorClass": "colorClass-editor",
-  "downloadButtonFlag": "downloadButtonFlag-editor"
+  "downloadButtonFlag": "downloadButtonFlag-editor",
+  "showViewButton": "showViewButton-editor"
 }
 
 const ADVANCED_PROPERTIES = {

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -3261,6 +3261,7 @@ export const advancedFields = [
       labelWidth: null,
       labelHidden: !0,
       limit: null,
+      showViewButton: true,
       accessType: "1",
       entityTableCode: null,
       entityTableDesc: null,

package/src/components/xform/form-render/indexMixin.js

@@ -43,6 +43,9 @@ import formulaDialog from "@base/components/xform/form-designer/form-widget/dial
 import baseFormulaDialog from "@base/components/xform/form-designer/form-widget/dialog/baseFormulaDialog.vue";
 import QRCode from "qrcode";
 import { openLuckysheetDialog } from "@base/components/luckysheet";
+import {
+  openComponentDialog as mountComponentDialog,
+} from "@base/utils/componentDialog";
 
 let modules = {};
 const baseRefUtil = {
@@ -3737,7 +3740,13 @@ modules = {
     },
     openLuckysheetDialog(option) {
       openLuckysheetDialog(option);
-    }
+    },
+    openComponentDialog(option = {}) {
+      return mountComponentDialog(option, this).catch((error) => {
+        this.$message.error(error.message || "组件弹框打开失败");
+        return null;
+      });
+    },
   },
 };
 

package/src/utils/componentDialog.js

@@ -0,0 +1,217 @@
+import Vue from "vue";
+
+const componentContext = require.context("../components", true, /\.vue$/, "lazy");
+const viewContext = require.context("../views", true, /\.vue$/, "lazy");
+const componentKeys = new Set(componentContext.keys());
+const viewKeys = new Set(viewContext.keys());
+
+function normalizePath(path) {
+  return String(path || "")
+    .trim()
+    .replace(/\\\\/g, "/")
+    .replace(/[?#].*$/, "")
+    .replace(/^\.\//, "")
+    .replace(/^src\//, "")
+    .replace(/^@base\//, "")
+    .replace(/^@\//, "")
+    .replace(/^\/+/, "")
+    .replace(/\/+$/, "");
+}
+
+function getComponentLoader(path) {
+  const normalizedPath = normalizePath(path);
+  if (!normalizedPath) {
+    throw new Error("[componentDialog] componentPath 不能为空");
+  }
+  if (normalizedPath.split("/").includes("..")) {
+    throw new Error("[componentDialog] componentPath 不允许包含 ..");
+  }
+
+  let context;
+  let contextKeys;
+  let relativePath;
+  if (normalizedPath.startsWith("components/")) {
+    context = componentContext;
+    contextKeys = componentKeys;
+    relativePath = normalizedPath.slice("components/".length);
+  } else if (normalizedPath.startsWith("views/")) {
+    context = viewContext;
+    contextKeys = viewKeys;
+    relativePath = normalizedPath.slice("views/".length);
+  } else {
+    throw new Error("[componentDialog] 只允许加载 src/components 或 src/views 下的组件");
+  }
+
+  const candidates = /\.vue$/i.test(relativePath)
+    ? [`./${relativePath}`]
+    : [`./${relativePath}.vue`, `./${relativePath}/index.vue`];
+  const componentKey = candidates.find((key) => contextKeys.has(key));
+  if (!componentKey) {
+    throw new Error(`[componentDialog] 找不到组件：${normalizedPath}`);
+  }
+  return () => Promise.resolve(context(componentKey));
+}
+
+async function loadComponent(path) {
+  const componentModule = await getComponentLoader(path)();
+  return componentModule.default || componentModule;
+}
+
+function callEvent(events, eventName, args) {
+  const handler = events[eventName];
+  if (typeof handler === "function") handler(...args);
+}
+
+function mountComponentDialog(component, options, parentVm) {
+  const {
+    wrapper = true,
+    dialog = {},
+    props = {},
+    attrs = {},
+    provide: provideValues = {},
+    events = {},
+    onClose,
+  } = options;
+  let hostInstance = null;
+  let destroyTimer = null;
+  let closeStarted = false;
+  let closeNotified = false;
+  let resizeHandler = null;
+  const centerTimers = [];
+
+  const centerDialog = () => {
+    if (!hostInstance || options.verticalCenter === false) return;
+    hostInstance.$nextTick(() => {
+      if (!hostInstance || !hostInstance.$el) return;
+      const hostElement = hostInstance.$el;
+      const dialogElement = hostElement.matches(".el-dialog")
+        ? hostElement
+        : hostElement.querySelector(".el-dialog");
+      if (!dialogElement || !dialogElement.offsetHeight) return;
+      const viewportHeight = window.innerHeight || document.documentElement.clientHeight;
+      dialogElement.style.marginTop = `${Math.max((viewportHeight - dialogElement.offsetHeight) / 2, 0)}px`;
+    });
+  };
+
+  const notifyClose = () => {
+    if (closeNotified) return;
+    closeNotified = true;
+    if (typeof onClose === "function") onClose();
+  };
+  const removeHost = () => {
+    if (!hostInstance) return;
+    centerTimers.forEach((timer) => clearTimeout(timer));
+    if (resizeHandler) window.removeEventListener("resize", resizeHandler);
+    resizeHandler = null;
+    const element = hostInstance.$el;
+    hostInstance.$destroy();
+    if (element && element.parentNode) element.parentNode.removeChild(element);
+    hostInstance = null;
+  };
+  const destroy = () => {
+    if (closeStarted) return;
+    closeStarted = true;
+    notifyClose();
+    destroyTimer = setTimeout(removeHost, 300);
+  };
+  const forceDestroy = () => {
+    if (destroyTimer) clearTimeout(destroyTimer);
+    destroyTimer = null;
+    closeStarted = true;
+    notifyClose();
+    removeHost();
+  };
+
+  const DialogHost = Vue.extend({
+    name: "DynamicComponentDialogHost",
+    provide() {
+      return provideValues;
+    },
+    data() {
+      return { visible: true };
+    },
+    methods: {
+      closeDialog() {
+        this.visible = false;
+        const componentInstance = this.$refs.contentComponent;
+        if (componentInstance && Object.prototype.hasOwnProperty.call(componentInstance, "showDialog")) {
+          componentInstance.showDialog = false;
+        }
+        destroy();
+      },
+    },
+    render(h) {
+      const childEvents = {};
+      Object.keys(events).forEach((eventName) => {
+        childEvents[eventName] = (...args) => callEvent(events, eventName, args);
+      });
+      childEvents["update:visible"] = (visible) => {
+        callEvent(events, "update:visible", [visible]);
+        this.visible = visible;
+        if (visible === false) this.closeDialog();
+      };
+      childEvents["update:visiable"] = (visible) => {
+        callEvent(events, "update:visiable", [visible]);
+        this.visible = visible;
+        if (visible === false) this.closeDialog();
+      };
+      childEvents.close = (...args) => {
+        callEvent(events, "close", args);
+        if (!wrapper) this.closeDialog();
+      };
+      const componentNode = h(component, {
+        ref: "contentComponent",
+        props: { ...props, visible: this.visible, visiable: this.visible },
+        attrs,
+        on: childEvents,
+      });
+      if (!wrapper) return componentNode;
+      return h("el-dialog", {
+        props: {
+          title: "",
+          width: "700px",
+          appendToBody: true,
+          closeOnClickModal: false,
+          ...dialog,
+          visible: this.visible,
+        },
+        on: {
+          "update:visible": (visible) => {
+            this.visible = visible;
+          },
+          close: destroy,
+        },
+      }, [componentNode]);
+    },
+  });
+
+  const parent = parentVm || (typeof window !== "undefined" && window.$vueRoot ? window.$vueRoot : null);
+  const instanceOptions = {};
+  if (parent) {
+    instanceOptions.parent = parent;
+    if (parent._i18n) instanceOptions.i18n = parent._i18n;
+  }
+  hostInstance = new DialogHost(instanceOptions);
+  hostInstance.$mount();
+  document.body.appendChild(hostInstance.$el);
+  if (options.verticalCenter !== false) {
+    resizeHandler = centerDialog;
+    window.addEventListener("resize", resizeHandler);
+    centerTimers.push(setTimeout(centerDialog, 0));
+    centerTimers.push(setTimeout(centerDialog, 300));
+  }
+  return {
+    host: hostInstance,
+    instance: hostInstance.$refs.contentComponent,
+    close() {
+      if (hostInstance) hostInstance.closeDialog();
+    },
+    destroy: forceDestroy,
+    recenter: centerDialog,
+  };
+}
+
+export async function openComponentDialog(options = {}, parentVm) {
+  const component = await loadComponent(options.componentPath);
+  return mountComponentDialog(component, options, parentVm);
+}