@fecp/designer 5.6.11 → 5.6.14

package/es/packages/mobile/src/index.vue.mjs

@@ -144,12 +144,12 @@ const _sfc_main = {
       pageParams.value = JSON.parse(routeParams);
     }
     emitter.on("loadPage", ({ pageId, params }) => {
-      loadPage(pageId);
       pageParams.value = params;
+      loadPage(pageId);
     });
     emitter.on("replaceLoadPage", ({ pageId, params }) => {
-      loadPage(pageId, true);
       pageParams.value = params;
+      loadPage(pageId, true);
     });
     emitter.on("refreshPage", () => {
       refreshCurrentPage();
@@ -255,7 +255,7 @@ const _sfc_main = {
     };
   }
 };
-const MobileApp = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-3f56bbe1"]]);
+const MobileApp = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-32479e3c"]]);
 export {
   MobileApp as default
 };

package/es/packages/vue/src/components/bus/approvalHistory/timeLine.vue.mjs

@@ -26,7 +26,7 @@ const _hoisted_4 = {
   class: "appContent"
 };
 const _hoisted_5 = { class: "openTask" };
-const _hoisted_6 = { style: { "font-weight": "bold" } };
+const _hoisted_6 = { style: { "font-weight": "bold", "flex": "1", "display": "flex", "width": "0", "margin-right": "12px" } };
 const _hoisted_7 = {
   key: 0,
   class: "appAssignee"

package/es/packages/vue/src/components/bus/flowChart/bpmnjs/component/timeline.vue.mjs

@@ -20,7 +20,7 @@ const _hoisted_5 = {
   class: "appContent"
 };
 const _hoisted_6 = { class: "openTask" };
-const _hoisted_7 = { style: { "font-weight": "bold" } };
+const _hoisted_7 = { style: { "font-weight": "bold", "flex": "1", "display": "flex", "width": "0", "margin-right": "12px" } };
 const _hoisted_8 = {
   key: 0,
   class: "appAssignee"
@@ -251,7 +251,7 @@ const _sfc_main = {
     };
   }
 };
-const timeline = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-4d562e1e"]]);
+const timeline = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-ce9dc48a"]]);
 export {
   timeline as default
 };

package/es/packages/vue/src/components/forms/form/Form.vue.mjs

@@ -7,7 +7,7 @@ import "../../../../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                                   */
 /* empty css                                                                  */
 /* empty css                                                                   */
-import { getCurrentInstance, ref, watch, onMounted, onBeforeUnmount, computed, provide, resolveDirective, withDirectives, createCommentVNode, createBlock, openBlock, normalizeClass, withCtx, createVNode, normalizeStyle, unref, createElementBlock, Fragment, renderList } from "vue";
+import { getCurrentInstance, ref, watch, onMounted, onBeforeUnmount, computed, nextTick, provide, resolveDirective, withDirectives, createCommentVNode, createBlock, openBlock, normalizeClass, withCtx, createVNode, normalizeStyle, unref, createElementBlock, Fragment, renderList } from "vue";
 import "../../../../../../node_modules/grid-layout-plus/es/index.mjs";
 import { getCurrentVueInstance } from "../../../utils/getInstance.mjs";
 import getJsonAsyncUtil from "../../../utils/getJsonAsyncUtil.mjs";
@@ -161,9 +161,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         }
       }
     );
+    let isSyncingToParent = false;
     watch(
       () => props.modelValue,
       (newVal, oldVal) => {
+        if (isSyncingToParent) return;
         if (JSON.stringify(newVal) !== JSON.stringify(oldVal)) {
           loadFormData("change");
         }
@@ -929,8 +931,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       }
       return result;
     };
+    let isApplyingLinkage = false;
     const applyLinkageEffectsForChangedFields = (changedFieldNames) => {
       var _a;
+      if (isApplyingLinkage) return;
+      isApplyingLinkage = true;
       const linkedConfig = localConfig.value.linkedConfig || {};
       const fields = [...fieldsData.value, ...hiddenFields.value];
       const relevantConfigs = filterRelevantLinkageConfigs(
@@ -953,7 +958,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                 value: formData.value,
                 fieldsList: fields
               });
-              formData.value[field.fieldName] = calcResult;
+              if (!isEqual(formData.value[field.fieldName], calcResult)) {
+                formData.value[field.fieldName] = calcResult;
+              }
             }
           });
         }
@@ -1069,6 +1076,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       const fieldsConfigArr = updatedLayoutData.filter((item) => !item.hidden);
       gridLayoutFieldsData.value = sortLayoutItems(fieldsConfigArr);
       (_a = gridLayout == null ? void 0 : gridLayout.value) == null ? void 0 : _a.resizeEvent();
+      isApplyingLinkage = false;
     };
     function sortLayoutItems(arr) {
       return [...arr].sort((a, b) => {
@@ -1148,7 +1156,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           applyLinkageEffectsForChangedFields(changedFields);
         }
         prevFormData.value = { ...formData.value };
+        isSyncingToParent = true;
         emit("update:modelValue", getFormData());
+        nextTick(() => {
+          isSyncingToParent = false;
+        });
       },
       { deep: true }
     );
@@ -1318,7 +1330,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-5a2b92b9"]]);
+const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-2a14b0ea"]]);
 export {
   _Form as default
 };

package/es/packages/vue/src/utils/importantDataChange.mjs

@@ -87,7 +87,6 @@ class ImportantDataChangeManager {
   }
   /**
    * 拉取所有配置组的变更日志
-   * TODO: 替换 mock API 为真实后端接口
    */
   async fetchChanges() {
     const allRecords = [];

package/lib/designer/package.json.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const version = "5.6.11";
+const version = "5.6.14";
 const packageJson = {
   version
 };

package/lib/designer/src/layout/index.vue.js

@@ -11,21 +11,21 @@ require("../../../node_modules/element-plus/es/index.js");
 require("../../../node_modules/element-plus/theme-chalk/el-config-provider.css.js");
 const Vue = require("vue");
 const zhCn = require("../../../node_modules/element-plus/es/locale/lang/zh-cn.js");
-const index$7 = ;/* empty css                 */
-const index$6 = ;/* empty css                  */
-const index$8 = ;/* empty css                    */
-const index$3 = ;/* empty css                           */
-const index$2 = ;/* empty css                          */
-const index$1 = require("../store/index.js");
+const index$5 = ;/* empty css                 */
+const index$4 = ;/* empty css                  */
+const index$6 = ;/* empty css                    */
+const index$1 = ;/* empty css                           */
+const index = ;/* empty css                          */
 const common = require("../packages/utils/common.js");
-const index = require("../api/index.js");
+const index$8 = require("../api/index.js");
 const _default = require("../packages/table/default.js");
 const _default$1 = require("../packages/form/default.js");
+const vuex_esmBundler = require("../../../node_modules/vuex/dist/vuex.esm-bundler.js");
 ;/* empty css            */
 const _pluginVue_exportHelper = require("../../../_virtual/_plugin-vue_export-helper.js");
-const index$4 = require("../../../node_modules/element-plus/es/components/config-provider/index.js");
-const index$5 = require("../../../node_modules/element-plus/es/components/container/index.js");
-const index$9 = require("../../../node_modules/element-plus/es/components/result/index.js");
+const index$2 = require("../../../node_modules/element-plus/es/components/config-provider/index.js");
+const index$3 = require("../../../node_modules/element-plus/es/components/container/index.js");
+const index$7 = require("../../../node_modules/element-plus/es/components/result/index.js");
 const _hoisted_1 = {
   key: 1,
   class: "init-error-container"
@@ -33,52 +33,55 @@ const _hoisted_1 = {
 const _sfc_main = {
   __name: "index",
   setup(__props) {
+    const store = vuex_esmBundler.useStore();
     const currentInstance = Vue.getCurrentInstance();
     const ctx = currentInstance.proxy;
     const pkId = getUrlParam("pkId");
     const isInitd = Vue.ref(0);
     const compRef = Vue.ref(null);
-    if (!pkId) {
-      isInitd.value = -1;
-    } else {
-      index.default.login4dev(ctx.$http).then((data) => {
-        index$1.default.commit("set_token", data.token);
-        index$1.default.commit("set_refreshToken", data.refreshToken);
-        index.default.getById(ctx.$http, pkId).then((data2) => {
-          const templateName = data2.templateName;
-          const templateKey = data2.templateKey;
-          document.title = templateName || "表单设计器";
-          if (data2.type == "table") {
-            const tableOptions = Vue.ref({
-              pkId,
-              templateName,
-              templateKey,
-              ..._default.defaultTableConfig,
-              ...JSON.parse(data2.context)
-            });
-            common.setEditConfigData(tableOptions.value);
-            isInitd.value = 1;
-          } else if (data2.type == "form") {
-            const formOptions = Vue.ref({
-              pkId,
-              templateName,
-              templateKey,
-              ..._default$1.defaultFormConfig,
-              ...JSON.parse(data2.context)
-            });
-            common.setEditConfigData(formOptions.value);
-            isInitd.value = 1;
-          }
-          index$1.default.commit("set_editing_type", data2.type);
-        });
-      });
+    async function init() {
+      if (!pkId) {
+        isInitd.value = -1;
+      } else {
+        if (!store.getters.token) {
+          const resData = await index$8.default.login4dev(ctx.$http);
+          store.commit("set_token", resData.token);
+          store.commit("set_refreshToken", resData.refreshToken);
+        }
+        const data = await index$8.default.getById(ctx.$http, pkId);
+        const templateName = data.templateName;
+        const templateKey = data.templateKey;
+        document.title = templateName || "表单设计器";
+        if (data.type == "table") {
+          const tableOptions = Vue.ref({
+            pkId,
+            templateName,
+            templateKey,
+            ..._default.defaultTableConfig,
+            ...JSON.parse(data.context)
+          });
+          common.setEditConfigData(tableOptions.value);
+          isInitd.value = 1;
+        } else if (data.type == "form") {
+          const formOptions = Vue.ref({
+            pkId,
+            templateName,
+            templateKey,
+            ..._default$1.defaultFormConfig,
+            ...JSON.parse(data.context)
+          });
+          common.setEditConfigData(formOptions.value);
+          isInitd.value = 1;
+        }
+        store.commit("set_editing_type", data.type);
+      }
     }
     const editingArea = Vue.computed(() => {
-      switch (index$1.default.getters.editingType) {
+      switch (store.getters.editingType) {
         case "table":
-          return index$3.default;
+          return index$1.default;
         case "form":
-          return index$2.default;
+          return index.default;
       }
       return null;
     });
@@ -97,11 +100,14 @@ const _sfc_main = {
       if (values.length === 0) return null;
       return values.length === 1 ? values[0] : values;
     }
+    Vue.onMounted(() => {
+      init();
+    });
     return (_ctx, _cache) => {
-      const _component_el_config_provider = index$4.ElConfigProvider;
-      const _component_el_main = index$5.ElMain;
-      const _component_el_container = index$5.ElContainer;
-      const _component_el_result = index$9.ElResult;
+      const _component_el_config_provider = index$2.ElConfigProvider;
+      const _component_el_main = index$3.ElMain;
+      const _component_el_container = index$3.ElContainer;
+      const _component_el_result = index$7.ElResult;
       return Vue.openBlock(), Vue.createBlock(_component_el_config_provider, { locale: Vue.unref(zhCn.default) }, {
         default: Vue.withCtx(() => [
           isInitd.value == 1 ? (Vue.openBlock(), Vue.createBlock(_component_el_container, {
@@ -109,10 +115,10 @@ const _sfc_main = {
             class: "fec-designer-container"
           }, {
             default: Vue.withCtx(() => [
-              Vue.createVNode(Vue.unref(index$6.default)),
+              Vue.createVNode(Vue.unref(index$4.default)),
               Vue.createVNode(_component_el_container, { class: "inner-container" }, {
                 default: Vue.withCtx(() => [
-                  Vue.createVNode(Vue.unref(index$7.default), { onOnFormDragMove: onFormDragMove }),
+                  Vue.createVNode(Vue.unref(index$5.default), { onOnFormDragMove: onFormDragMove }),
                   Vue.createVNode(_component_el_main, { class: "root-main" }, {
                     default: Vue.withCtx(() => [
                       Vue.createVNode(_component_el_config_provider, { locale: Vue.unref(zhCn.default) }, {
@@ -127,7 +133,7 @@ const _sfc_main = {
                     ]),
                     _: 1
                   }),
-                  Vue.createVNode(Vue.unref(index$8.default))
+                  Vue.createVNode(Vue.unref(index$6.default))
                 ]),
                 _: 1
               })
@@ -146,5 +152,5 @@ const _sfc_main = {
     };
   }
 };
-const layout = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-ae1b4337"]]);
+const layout = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-10018284"]]);
 exports.default = layout;

package/lib/designer/src/packages/dialog/useDialogDialog.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const index = require("./index.vue.js");
+const index = require("./index.vue2.js");
 const Vue = require("vue");
 function useDialogDialog() {
   const dialogDialogVisible = Vue.ref(false);

package/lib/designer/src/packages/dialogGlobal/index.vue.js

@@ -87,7 +87,7 @@ const widgets = require("../table/property/widgets.vue.js");
 require("../../../../node_modules/element-plus/theme-chalk/el-tab-pane.css.js");
 ;/* empty css                                                              */
 ;/* empty css                                         */
-;/* empty css                                   */
+;/* empty css                                  */
 ;/* empty css                                                            */
 ;/* empty css                                                            */
 ;/* empty css                             */

package/lib/designer/src/packages/dialogGlobal/index.vue2.js

@@ -76,6 +76,7 @@ const widgets = require("../table/property/widgets.vue.js");
 ;/* empty css                                                                       */
 ;/* empty css                                     */
 ;/* empty css                                                  */
+;/* empty css                                             */
 ;/* empty css                                                                   */
 ;/* empty css                                                              */
 ;/* empty css                                                                     */

package/lib/designer/src/packages/dialogGlobal/useDialogGlobalDialog.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const index = require("./index.vue.js");
+const index = require("./index.vue2.js");
 const Vue = require("vue");
 function useDialogGlobalDialog() {
   const dialogGlobalDialogVisible = Vue.ref(false);

package/lib/designer/src/packages/form/property/widgets.vue.js

@@ -54,8 +54,8 @@ const _pluginVue_exportHelper = require("../../../../../_virtual/_plugin-vue_exp
 require("../../../components/TemplateSelector.vue.js");
 require("../../table/default.js");
 ;/* empty css                                 */
-;/* empty css                       */
-;/* empty css                             */
+;/* empty css                      */
+;/* empty css                            */
 require("../../../store/index.js");
 ;/* empty css              */
 const index$2 = require("../../../../../node_modules/element-plus/es/components/collapse/index.js");

package/lib/designer/src/packages/importantDataChange/index.vue.js

@@ -180,5 +180,5 @@ const _sfc_main = {
     };
   }
 };
-const ImportantDataChangeDialog = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-e3b38158"]]);
+const ImportantDataChangeDialog = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-ed2c5a64"]]);
 exports.default = ImportantDataChangeDialog;