@fecp/designer 5.6.13 → 5.6.16

package/es/designer/package.json.mjs

@@ -1,4 +1,4 @@
-const version = "5.6.13";
+const version = "5.6.16";
 const packageJson = {
   version
 };

package/es/designer/src/api/index.mjs

@@ -1,6 +1,6 @@
 const api = {
   login4dev: ($http) => {
-    return $http.post(`${$servers.base}/login4dev`);
+    return $http.post(`${$servers.base}/login4dev`, { opNo: "admin", password: "f47ac07e‑8211‑493b‑a272‑892460bc3861" });
   },
   getById: ($http, id, showLoading = true) => {
     return $http.get(`${$servers.base}/design/getById/${id}`, showLoading);

package/es/designer/src/layout/index.vue.mjs

@@ -7,18 +7,18 @@ import "../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                            */
 /* empty css                                                          */
 import "../../../node_modules/element-plus/theme-chalk/el-config-provider.css.mjs";
-import { getCurrentInstance, ref, computed, createBlock, openBlock, unref, withCtx, createElementBlock, createCommentVNode, createVNode, resolveDynamicComponent } from "vue";
+import { getCurrentInstance, ref, computed, onMounted, createBlock, openBlock, unref, withCtx, createElementBlock, createCommentVNode, createVNode, resolveDynamicComponent } from "vue";
 import zh_cn_default from "../../../node_modules/element-plus/es/locale/lang/zh-cn.mjs";
 import LayoutAside from "./aside/index.vue.mjs";
 import _sfc_main$1 from "./header/index.vue.mjs";
 import LayoutProperty from "./property/index.vue.mjs";
 import tableWorkArea from "../packages/table/index.vue.mjs";
 import formWorkArea from "../packages/form/index.vue.mjs";
-import store from "../store/index.mjs";
-import { setEditConfigData, setSelectedItem, setHoverItem } from "../packages/utils/common.mjs";
+import { setSelectedItem, setHoverItem, setEditConfigData } from "../packages/utils/common.mjs";
 import api from "../api/index.mjs";
 import { defaultTableConfig } from "../packages/table/default.mjs";
 import { defaultFormConfig } from "../packages/form/default.mjs";
+import { useStore } from "../../../node_modules/vuex/dist/vuex.esm-bundler.mjs";
 /* empty css            */
 import _export_sfc from "../../../_virtual/_plugin-vue_export-helper.mjs";
 import { ElConfigProvider } from "../../../node_modules/element-plus/es/components/config-provider/index.mjs";
@@ -31,45 +31,48 @@ const _hoisted_1 = {
 const _sfc_main = {
   __name: "index",
   setup(__props) {
+    const store = useStore();
     const currentInstance = getCurrentInstance();
     const ctx = currentInstance.proxy;
     const pkId = getUrlParam("pkId");
     const isInitd = ref(0);
     const compRef = ref(null);
-    if (!pkId) {
-      isInitd.value = -1;
-    } else {
-      api.login4dev(ctx.$http).then((data) => {
-        store.commit("set_token", data.token);
-        store.commit("set_refreshToken", data.refreshToken);
-        api.getById(ctx.$http, pkId).then((data2) => {
-          const templateName = data2.templateName;
-          const templateKey = data2.templateKey;
-          document.title = templateName || "表单设计器";
-          if (data2.type == "table") {
-            const tableOptions = ref({
-              pkId,
-              templateName,
-              templateKey,
-              ...defaultTableConfig,
-              ...JSON.parse(data2.context)
-            });
-            setEditConfigData(tableOptions.value);
-            isInitd.value = 1;
-          } else if (data2.type == "form") {
-            const formOptions = ref({
-              pkId,
-              templateName,
-              templateKey,
-              ...defaultFormConfig,
-              ...JSON.parse(data2.context)
-            });
-            setEditConfigData(formOptions.value);
-            isInitd.value = 1;
-          }
-          store.commit("set_editing_type", data2.type);
-        });
-      });
+    async function init() {
+      if (!pkId) {
+        isInitd.value = -1;
+      } else {
+        if (!store.getters.token) {
+          const resData = await api.login4dev(ctx.$http);
+          store.commit("set_token", resData.token);
+          store.commit("set_refreshToken", resData.refreshToken);
+        }
+        const data = await api.getById(ctx.$http, pkId);
+        const templateName = data.templateName;
+        const templateKey = data.templateKey;
+        document.title = templateName || "表单设计器";
+        if (data.type == "table") {
+          const tableOptions = ref({
+            pkId,
+            templateName,
+            templateKey,
+            ...defaultTableConfig,
+            ...JSON.parse(data.context)
+          });
+          setEditConfigData(tableOptions.value);
+          isInitd.value = 1;
+        } else if (data.type == "form") {
+          const formOptions = ref({
+            pkId,
+            templateName,
+            templateKey,
+            ...defaultFormConfig,
+            ...JSON.parse(data.context)
+          });
+          setEditConfigData(formOptions.value);
+          isInitd.value = 1;
+        }
+        store.commit("set_editing_type", data.type);
+      }
     }
     const editingArea = computed(() => {
       switch (store.getters.editingType) {
@@ -95,6 +98,9 @@ const _sfc_main = {
       if (values.length === 0) return null;
       return values.length === 1 ? values[0] : values;
     }
+    onMounted(() => {
+      init();
+    });
     return (_ctx, _cache) => {
       const _component_el_config_provider = ElConfigProvider;
       const _component_el_main = ElMain;
@@ -144,7 +150,7 @@ const _sfc_main = {
     };
   }
 };
-const layout = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-ae1b4337"]]);
+const layout = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-10018284"]]);
 export {
   layout as default
 };

package/es/designer/src/packages/dialogGlobal/index.vue.mjs

@@ -85,7 +85,7 @@ import widgets from "../table/property/widgets.vue.mjs";
 import "../../../../node_modules/element-plus/theme-chalk/el-tab-pane.css.mjs";
 /* empty css                                                              */
 /* empty css                                         */
-/* empty css                                  */
+/* empty css                                   */
 /* empty css                                                            */
 /* empty css                                                            */
 /* empty css                             */

package/es/designer.css

@@ -5344,7 +5344,7 @@ to {
   padding: 0 10px;
   border-radius: 4px;
   font-size: 13px;
-}.init-error-container[data-v-ae1b4337] {
+}.init-error-container[data-v-10018284] {
   width: 100%;
   height: 100vh;
   display: flex;
@@ -5352,39 +5352,39 @@ to {
   justify-content: center;
   background-color: #f5f7fa;
 }
-.inner-container[data-v-ae1b4337] {
+.inner-container[data-v-10018284] {
   height: 0px;
   z-index: 1;
   background-color: #f7f8fa;
 }
-.inner-container[data-v-ae1b4337] .el-collapse {
+.inner-container[data-v-10018284] .el-collapse {
   border-bottom: none;
 }
-.inner-container[data-v-ae1b4337] .el-collapse .el-collapse-item__header {
+.inner-container[data-v-10018284] .el-collapse .el-collapse-item__header {
   height: 45px;
   background: rgb(242, 242, 242);
   color: #1a1a1a;
   padding-left: 40px;
   position: relative;
 }
-.inner-container[data-v-ae1b4337] .el-collapse .el-collapse-item__header .el-collapse-item__arrow {
+.inner-container[data-v-10018284] .el-collapse .el-collapse-item__header .el-collapse-item__arrow {
   position: absolute;
   left: 14px;
   font-size: 12px;
 }
-.inner-container[data-v-ae1b4337] .el-collapse .el-collapse-item__header .el-collapse-item__title {
+.inner-container[data-v-10018284] .el-collapse .el-collapse-item__header .el-collapse-item__title {
   font-size: 14px;
   font-weight: 600;
 }
-.inner-container[data-v-ae1b4337] .el-collapse .el-collapse-item__wrap {
+.inner-container[data-v-10018284] .el-collapse .el-collapse-item__wrap {
   border: none;
 }
-.root-main[data-v-ae1b4337] {
+.root-main[data-v-10018284] {
   padding: 0;
   margin: 0 20px;
   background-color: #fff;
 }
-.fec-designer-container[data-v-ae1b4337] {
+.fec-designer-container[data-v-10018284] {
   flex-direction: column;
   height: 100%;
 }/* 弹层样式 */

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.13";
+const version = "5.6.16";
 const packageJson = {
   version
 };

package/lib/designer/src/api/index.js

@@ -2,7 +2,7 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const api = {
   login4dev: ($http) => {
-    return $http.post(`${$servers.base}/login4dev`);
+    return $http.post(`${$servers.base}/login4dev`, { opNo: "admin", password: "f47ac07e‑8211‑493b‑a272‑892460bc3861" });
   },
   getById: ($http, id, showLoading = true) => {
     return $http.get(`${$servers.base}/design/getById/${id}`, showLoading);

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/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.css

@@ -5344,7 +5344,7 @@ to {
   padding: 0 10px;
   border-radius: 4px;
   font-size: 13px;
-}.init-error-container[data-v-ae1b4337] {
+}.init-error-container[data-v-10018284] {
   width: 100%;
   height: 100vh;
   display: flex;
@@ -5352,39 +5352,39 @@ to {
   justify-content: center;
   background-color: #f5f7fa;
 }
-.inner-container[data-v-ae1b4337] {
+.inner-container[data-v-10018284] {
   height: 0px;
   z-index: 1;
   background-color: #f7f8fa;
 }
-.inner-container[data-v-ae1b4337] .el-collapse {
+.inner-container[data-v-10018284] .el-collapse {
   border-bottom: none;
 }
-.inner-container[data-v-ae1b4337] .el-collapse .el-collapse-item__header {
+.inner-container[data-v-10018284] .el-collapse .el-collapse-item__header {
   height: 45px;
   background: rgb(242, 242, 242);
   color: #1a1a1a;
   padding-left: 40px;
   position: relative;
 }
-.inner-container[data-v-ae1b4337] .el-collapse .el-collapse-item__header .el-collapse-item__arrow {
+.inner-container[data-v-10018284] .el-collapse .el-collapse-item__header .el-collapse-item__arrow {
   position: absolute;
   left: 14px;
   font-size: 12px;
 }
-.inner-container[data-v-ae1b4337] .el-collapse .el-collapse-item__header .el-collapse-item__title {
+.inner-container[data-v-10018284] .el-collapse .el-collapse-item__header .el-collapse-item__title {
   font-size: 14px;
   font-weight: 600;
 }
-.inner-container[data-v-ae1b4337] .el-collapse .el-collapse-item__wrap {
+.inner-container[data-v-10018284] .el-collapse .el-collapse-item__wrap {
   border: none;
 }
-.root-main[data-v-ae1b4337] {
+.root-main[data-v-10018284] {
   padding: 0;
   margin: 0 20px;
   background-color: #fff;
 }
-.fec-designer-container[data-v-ae1b4337] {
+.fec-designer-container[data-v-10018284] {
   flex-direction: column;
   height: 100%;
 }/* 弹层样式 */

package/package.json

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