@fecp/designer 5.4.26 → 5.4.30

package/lib/packages/vue/src/components/dialog/customDialog/CustomDialog.vue.js

@@ -0,0 +1,172 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+require("../../../../../../node_modules/element-plus/es/index.js");
+;/* empty css                                                                */
+;/* empty css                                                                      */
+;/* empty css                                                                     */
+;/* empty css                                                                     */
+const vue = require("vue");
+;/* empty css                   */
+const index = require("../../../../../../node_modules/element-plus/es/components/dialog/index.js");
+const index$1 = require("../../../../../../node_modules/element-plus/es/components/button/index.js");
+const _sfc_main = {
+  __name: "CustomDialog",
+  props: {
+    modelValue: {
+      type: Boolean,
+      default: false
+    },
+    initOption: {
+      type: Object,
+      default: {
+        width: ""
+      }
+    },
+    width: {
+      type: String,
+      default: ""
+    },
+    height: {
+      type: String,
+      default: "auto"
+    },
+    //max,default,min
+    size: {
+      type: String,
+      default: "default"
+    },
+    class: {
+      type: String,
+      default: ""
+    },
+    title: {
+      type: String,
+      default: "标题"
+    },
+    submitButtonText: {
+      type: String,
+      default: "确定"
+    },
+    cancelButtonText: {
+      type: String,
+      default: "取消"
+    },
+    query: {
+      type: Boolean,
+      default: false
+    },
+    appendToBody: {
+      type: Boolean,
+      default: false
+    },
+    hiddenFooter: {
+      type: Boolean,
+      default: false
+    }
+  },
+  emits: ["submit", "onClose", "update:modelValue"],
+  setup(__props, { emit: __emit }) {
+    const props = __props;
+    const slotFooter = !!vue.useSlots().footer;
+    const dialogWidth = vue.computed(() => {
+      let w = props.initOption.width || props.width;
+      if (w) {
+        return w;
+      } else {
+        if (props.size == "default") {
+          return "65%";
+        } else if (props.size == "max") {
+          return "80%";
+        } else if (props.size == "min") {
+          return "50%";
+        }
+      }
+    });
+    const dialogVisible = vue.ref(false);
+    const emit = __emit;
+    const onClose = () => {
+      emit("onClose");
+      emit("update:modelValue", false);
+    };
+    vue.ref();
+    function submit() {
+      emit("submit");
+    }
+    const isFullscreen = vue.ref(false);
+    function changeFullscreen() {
+      isFullscreen.value = !isFullscreen.value;
+    }
+    vue.watch(
+      () => props.modelValue,
+      (visible) => {
+        if (visible) {
+          isFullscreen.value = false;
+        }
+        dialogVisible.value = visible;
+      },
+      {
+        immediate: true
+      }
+    );
+    return (_ctx, _cache) => {
+      const _component_el_button = index$1.ElButton;
+      const _component_el_dialog = index.ElDialog;
+      return vue.openBlock(), vue.createBlock(_component_el_dialog, {
+        modelValue: vue.unref(dialogVisible),
+        "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => vue.isRef(dialogVisible) ? dialogVisible.value = $event : null),
+        title: props.title,
+        onClose,
+        "destroy-on-close": "",
+        draggable: "",
+        "append-to-body": props.appendToBody,
+        "close-on-click-modal": false,
+        "close-on-press-escape": false,
+        width: vue.unref(dialogWidth),
+        class: vue.normalizeClass(props.class + " custom-dialog"),
+        style: vue.normalizeStyle("height:" + __props.height),
+        fullscreen: vue.unref(isFullscreen)
+      }, vue.createSlots({
+        header: vue.withCtx(() => [
+          vue.createElementVNode("span", null, vue.toDisplayString(props.title), 1),
+          vue.createElementVNode("i", {
+            class: "iconfont icon-MaxScreen max-screen",
+            onClick: changeFullscreen
+          })
+        ]),
+        default: vue.withCtx(() => [
+          vue.renderSlot(_ctx.$slots, "default")
+        ]),
+        _: 2
+      }, [
+        !__props.hiddenFooter ? {
+          name: "footer",
+          fn: vue.withCtx(() => [
+            vue.createVNode(_component_el_button, {
+              onClick: _cache[0] || (_cache[0] = ($event) => dialogVisible.value = false)
+            }, {
+              default: vue.withCtx(() => [
+                vue.createTextVNode(vue.toDisplayString(props.cancelButtonText), 1)
+              ]),
+              _: 1
+            }),
+            slotFooter ? vue.renderSlot(_ctx.$slots, "footer", { key: 0 }) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 1 }, [
+              !props.query ? (vue.openBlock(), vue.createBlock(_component_el_button, {
+                key: 0,
+                type: "primary",
+                onClick: submit,
+                size: "default"
+              }, {
+                default: vue.withCtx(() => [
+                  vue.createTextVNode(vue.toDisplayString(props.submitButtonText), 1)
+                ]),
+                _: 1
+              })) : vue.createCommentVNode("", true)
+            ], 64))
+          ]),
+          key: "0"
+        } : void 0
+      ]), 1032, ["modelValue", "title", "append-to-body", "width", "class", "style", "fullscreen"]);
+    };
+  }
+};
+exports.default = _sfc_main;

package/lib/packages/vue/src/components/dialog/customDialog/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const CustomDialog = require("./CustomDialog.vue.js");
+const install = require("../../../utils/install.js");
+const customDialog = install.default.withInstall("CustomDialog", CustomDialog.default);
+exports.customDialog = customDialog;
+exports.default = customDialog;

package/lib/packages/vue/src/components/forms/form/Form.vue.js

@@ -147,7 +147,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       }
     );
     const loadConfig = async () => {
-      if (!props.templateKey) {
+      if (!props.templateKey && props.initOption && Object.keys(props.initOption).length == 0) {
         return;
       }
       configLoading.value = true;
@@ -192,7 +192,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         mergeOptionsToFields();
         initGridLayoutDataConfig();
         initLinkage();
-        emit("loaded", option);
+        emit("loaded", option, getFormData());
       } catch (error) {
         console.error("加载配置失败:", error);
         index.ElMessage.error("加载配置失败");
@@ -813,7 +813,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       );
       relevantConfigs.dataLink.forEach((item) => {
         if (parseFilterConfig.checkFilterMatch(item.filterConfig, formData.value, fields)) {
-          debugger;
           const fieldAssignments = item.fieldAssignments || [];
           fieldAssignments.forEach((assignment) => {
             var _a2, _b;
@@ -824,7 +823,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
               const calcResult = calculate.calculate({
                 text: formulaText,
                 marks: [],
-                value: formData.value
+                value: formData.value,
+                fieldsList: fields
               });
               formData.value[field.fieldName] = calcResult;
             }
@@ -1066,5 +1066,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-eb63b66b"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-4eb26904"]]);
 exports.default = _Form;

package/lib/packages/vue/src/components/layout/Layout.vue.js

@@ -0,0 +1,81 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+require("../../../../../node_modules/element-plus/es/index.js");
+;/* empty css                                                             */
+;/* empty css                                                               */
+;/* empty css                                                               */
+;/* empty css                                                                     */
+const vue = require("vue");
+const index$3 = require("../forms/form/index.js");
+const common = require("../../utils/common.js");
+;/* empty css             */
+const _pluginVue_exportHelper = require("../../../../../_virtual/_plugin-vue_export-helper.js");
+const index = require("../../../../../node_modules/element-plus/es/components/row/index.js");
+const index$1 = require("../../../../../node_modules/element-plus/es/components/col/index.js");
+const index$2 = require("../../../../../node_modules/element-plus/es/components/scrollbar/index.js");
+const _hoisted_1 = { class: "grid-content" };
+const _hoisted_2 = { class: "grid-content-statistics" };
+const _sfc_main = {
+  __name: "Layout",
+  props: {
+    templateKey: {
+      type: String,
+      default: ""
+    }
+  },
+  emits: ["loaded"],
+  setup(__props, { emit: __emit }) {
+    const formData = vue.ref({});
+    const emit = __emit;
+    const showCard = vue.ref(false);
+    function loaded(option, formData2) {
+      showCard.value = true;
+      emit("loaded", common.cloneDeep(formData2));
+    }
+    return (_ctx, _cache) => {
+      const _component_el_scrollbar = index$2.ElScrollbar;
+      const _component_el_col = index$1.ElCol;
+      const _component_el_row = index.ElRow;
+      const _directive_fec_layout = vue.resolveDirective("fec-layout");
+      return vue.withDirectives((vue.openBlock(), vue.createBlock(_component_el_row, {
+        gutter: 8,
+        class: "fec-layout-row"
+      }, {
+        default: vue.withCtx(() => [
+          vue.createVNode(_component_el_col, { span: 18 }, {
+            default: vue.withCtx(() => [
+              vue.createElementVNode("div", _hoisted_1, [
+                vue.createVNode(_component_el_scrollbar, { ref: "scrollbarRef" }, {
+                  default: vue.withCtx(() => [
+                    vue.createVNode(vue.unref(index$3.Form), {
+                      ref: "formRef",
+                      templateKey: __props.templateKey,
+                      modelValue: vue.unref(formData),
+                      "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.isRef(formData) ? formData.value = $event : null),
+                      onLoaded: loaded
+                    }, null, 8, ["templateKey", "modelValue"])
+                  ]),
+                  _: 1
+                }, 512)
+              ])
+            ]),
+            _: 1
+          }),
+          vue.createVNode(_component_el_col, { span: 6 }, {
+            default: vue.withCtx(() => [
+              vue.createElementVNode("div", _hoisted_2, [
+                vue.unref(showCard) ? vue.renderSlot(_ctx.$slots, "card", { key: 0 }, void 0, true) : vue.createCommentVNode("", true)
+              ])
+            ]),
+            _: 3
+          })
+        ]),
+        _: 3
+      })), [
+        [_directive_fec_layout]
+      ]);
+    };
+  }
+};
+const _Layout = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-bb40b3aa"]]);
+exports.default = _Layout;

package/lib/packages/vue/src/components/layout/index.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const Layout$1 = require("./Layout.vue.js");
+const install = require("../../utils/install.js");
+const index = require("./layoutCard/index.js");
+const Layout = install.default.withInstall("Layout", Layout$1.default);
+exports.LayoutCard = index.LayoutCard;
+exports.Layout = Layout;
+exports.default = Layout;

package/lib/packages/vue/src/components/layout/layoutCard/LayoutCard.vue.js

@@ -0,0 +1,162 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+require("../../../../../../node_modules/element-plus/es/index.js");
+;/* empty css                                                                */
+;/* empty css                                                                     */
+const vue = require("vue");
+const index$2 = require("../../../../../../node_modules/@element-plus/icons-vue/dist/index.js");
+const index$3 = require("../../dialog/customDialog/index.js");
+const index$4 = require("../../../api/index.js");
+const getInstance = require("../../../utils/getInstance.js");
+const index$5 = require("../../forms/form/index.js");
+const index$6 = require("../../table/index.js");
+;/* empty css                 */
+const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.js");
+const index = require("../../../../../../node_modules/element-plus/es/components/button/index.js");
+const index$1 = require("../../../../../../node_modules/element-plus/es/components/icon/index.js");
+const _hoisted_1 = { class: "fec-layout-card" };
+const _hoisted_2 = { class: "header" };
+const _hoisted_3 = { class: "title" };
+const _hoisted_4 = { class: "content" };
+const _sfc_main = {
+  __name: "LayoutCard",
+  props: {
+    //标题
+    title: {
+      type: String,
+      default: ""
+    },
+    //图标
+    icon: {
+      type: String,
+      default: "icon-authorization"
+    },
+    //图标背景色
+    iconColor: {
+      type: String,
+      default: "#4fbdc1"
+    },
+    morePageRoute: {
+      type: String,
+      default: ""
+    },
+    morePageTemplateKey: {
+      type: String,
+      default: ""
+    },
+    morePageParams: {
+      type: Object,
+      default: {}
+    }
+  },
+  setup(__props) {
+    const props = __props;
+    const ctx = getInstance.getCurrentVueInstance();
+    const isMoreBtn = vue.computed(() => {
+      return props.morePageRoute || props.morePageTemplateKey;
+    });
+    const dialogVisible = vue.ref(false);
+    const currentComponent = vue.ref(null);
+    const currentParams = vue.ref(props.morePageParams);
+    const flag = vue.ref(true);
+    vue.watch(currentParams, () => {
+      if (props.morePageRoute && Object.keys(currentParams).length > 0) {
+        flag.value = false;
+        vue.nextTick(() => {
+          flag.value = true;
+        });
+      }
+    });
+    function moreClick() {
+      if (props.morePageRoute) {
+        loadComponentByPath(props.morePageRoute);
+        dialogVisible.value = true;
+      } else if (props.morePageTemplateKey) {
+        index$4.default.findByTemplateKey(ctx.$http, {
+          templateKey: props.morePageTemplateKey,
+          timestamp: Date.now(),
+          templateVersion: "v5"
+        }).then((res) => {
+          const data = JSON.parse(res);
+          if (data.formMode) {
+            currentComponent.value = index$5.Form;
+          } else {
+            currentComponent.value = index$6.Table;
+          }
+          currentParams.value.initOption = data;
+          currentParams.value.isDialog = true;
+          dialogVisible.value = true;
+        });
+      }
+    }
+    function loadComponentByPath(path) {
+      const route = ctx.$router.getRoutes().find((item) => item.path === path);
+      if (!route) return;
+      const comp = route.components.default;
+      if (!comp) return;
+      if (typeof comp === "function") {
+        comp().then((module2) => {
+          currentComponent.value = module2.default;
+        });
+      } else {
+        currentComponent.value = comp;
+      }
+    }
+    return (_ctx, _cache) => {
+      const _component_el_icon = index$1.ElIcon;
+      const _component_el_button = index.ElButton;
+      return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
+        vue.createElementVNode("div", _hoisted_1, [
+          vue.createElementVNode("div", _hoisted_2, [
+            vue.createElementVNode("div", _hoisted_3, [
+              __props.title ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
+                vue.createElementVNode("i", {
+                  class: vue.normalizeClass("icon iconfont " + __props.icon),
+                  style: vue.normalizeStyle("background-color:" + __props.iconColor)
+                }, null, 6),
+                vue.createElementVNode("span", null, vue.toDisplayString(__props.title), 1)
+              ], 64)) : vue.createCommentVNode("", true)
+            ]),
+            vue.unref(isMoreBtn) ? (vue.openBlock(), vue.createBlock(_component_el_button, {
+              key: 0,
+              class: "moreBtn",
+              type: "primary",
+              link: "",
+              onClick: moreClick
+            }, {
+              default: vue.withCtx(() => [
+                _cache[1] || (_cache[1] = vue.createTextVNode("更多信息")),
+                vue.createVNode(_component_el_icon, null, {
+                  default: vue.withCtx(() => [
+                    vue.createVNode(vue.unref(index$2.ArrowRight))
+                  ]),
+                  _: 1
+                })
+              ]),
+              _: 1
+            })) : vue.createCommentVNode("", true)
+          ]),
+          vue.createElementVNode("div", _hoisted_4, [
+            vue.renderSlot(_ctx.$slots, "default", {}, void 0, true)
+          ])
+        ]),
+        vue.createVNode(vue.unref(index$3.customDialog), {
+          modelValue: vue.unref(dialogVisible),
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.isRef(dialogVisible) ? dialogVisible.value = $event : null),
+          width: "80%",
+          height: "100%",
+          query: "",
+          "append-to-body": "",
+          title: __props.title
+        }, {
+          default: vue.withCtx(() => [
+            vue.unref(flag) && vue.unref(currentComponent) ? (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(vue.unref(currentComponent)), vue.normalizeProps(vue.mergeProps({ key: 0 }, vue.unref(currentParams))), null, 16)) : vue.createCommentVNode("", true)
+          ]),
+          _: 1
+        }, 8, ["modelValue", "title"])
+      ], 64);
+    };
+  }
+};
+const _LayoutCard = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-3ce25014"]]);
+exports.default = _LayoutCard;

package/lib/packages/vue/src/components/layout/layoutCard/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const LayoutCard$1 = require("./LayoutCard.vue.js");
+const install = require("../../../utils/install.js");
+const LayoutCard = install.default.withInstall("LayoutCard", LayoutCard$1.default);
+exports.LayoutCard = LayoutCard;
+exports.default = LayoutCard;

package/lib/packages/vue/src/directive/layout.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const layout = {
+  mounted(el, binding, vnode, prevVnode) {
+    if (el.parentElement.className.indexOf("h-main") != -1) {
+      document.querySelector(".h-main").setAttribute(
+        "style",
+        "background-color:transparent;padding:0px;border:0px;"
+      );
+    }
+    if (el.parentElement.className.indexOf("root-main") != -1) {
+      document.querySelector(".root-main").setAttribute(
+        "style",
+        "background-color:transparent;padding:0px;border:0px;"
+      );
+    }
+    if (el.parentElement.parentElement.className.indexOf("el-dialog__body") != -1) {
+      el.parentElement.parentElement.setAttribute(
+        "style",
+        "background-color:#F7F7F7;"
+      );
+    }
+  }
+};
+layout.install = function(Vue) {
+  Vue.directive("fec-layout", layout);
+};
+exports.default = layout;

package/lib/packages/vue/src/utils/datasource.js

@@ -184,7 +184,7 @@ class DataSourceManager {
           const responseMessage = response.message;
           if (this.pagination) {
             this.data.list = (responseData == null ? void 0 : responseData.records) || responseData;
-            this.data.total = (responseData == null ? void 0 : responseData.total) || responseData.length;
+            this.data.total = (responseData == null ? void 0 : responseData.total) || (responseData == null ? void 0 : responseData.length);
           } else {
             this.data = responseData;
           }
@@ -202,7 +202,7 @@ class DataSourceManager {
         const responseData = response;
         if (this.pagination) {
           this.data.list = (responseData == null ? void 0 : responseData.records) || responseData;
-          this.data.total = (responseData == null ? void 0 : responseData.total) || responseData.length;
+          this.data.total = (responseData == null ? void 0 : responseData.total) || (responseData == null ? void 0 : responseData.length);
         } else {
           this.data = responseData;
         }

package/lib/packages/vue/src/utils/formulajs/calculate.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const functionCore = require("./functionCore.js");
 require("vue");
 function calculate(params) {
-  const { text, marks = [], value = {} } = params;
+  const { text, marks = [], value = {}, fieldsList = [] } = params;
   if (!text) return new Error("非法公式");
   try {
     let str = text;
@@ -25,15 +25,30 @@ function calculate(params) {
         const [key, subKey] = enCode.split(".");
         if (value[key]) data = value[key].map((o) => o[subKey]);
       }
-      if (data !== void 0) {
-        if (typeof data != "string") {
-          data = JSON.stringify(data);
+      if (!data) {
+        const fieldItem = fieldsList.find((item2) => item2.fieldName == enCode);
+        if (fieldItem) {
+          switch (fieldItem.fieldType) {
+            case "number":
+              data = 0;
+              break;
+            case "switch":
+              data = false;
+              break;
+            default:
+              data = "";
+          }
+        } else {
+          throw new Error("字段：" + item.fieldName + " 未定义");
         }
-        const actualStart = startIndex + offset;
-        const actualEnd = endIndex + offset;
-        str = str.slice(0, actualStart) + data.toString() + str.slice(actualEnd);
-        offset += data.toString().length - (endIndex - startIndex);
       }
+      if (typeof data != "string") {
+        data = JSON.stringify(data);
+      }
+      const actualStart = startIndex + offset;
+      const actualEnd = endIndex + offset;
+      str = str.slice(0, actualStart) + data.toString() + str.slice(actualEnd);
+      offset += data.toString().length - (endIndex - startIndex);
     }
     const result = functionCore.default.executeFunction(str);
     return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecp/designer",
-  "version": "5.4.26",
+  "version": "5.4.30",
   "main": "lib/designer/index.js",
   "module": "es/designer/index.mjs",
   "files": [