fec-dev-designer 1.0.4 → 1.0.5

package/es/src/components/ValueSelector.vue2.js

@@ -1,9 +1,10 @@
-import { computed as n, openBlock as b, createBlock as V, resolveDynamicComponent as g, withCtx as A, createVNode as x } from "vue";
-import { ElInputTag as C, ElInput as N } from "element-plus";
-import I from "./ValueSelectorPopover.vue2.js";
+import { computed as o, openBlock as V, createBlock as g, resolveDynamicComponent as A, withCtx as x, createVNode as C } from "vue";
+import { ElInputTag as F, ElInput as N } from "element-plus";
+import h from "./ValueSelectorPopover.vue2.js";
+import { getEditConfigData as I } from "../packages/utils/common.js";
 import "./ValueSelector.vue.js";
 import B from "../../_virtual/_plugin-vue_export-helper.js";
-const F = {
+const $ = {
   __name: "ValueSelector",
   props: {
     // modelValue 的格式：
@@ -38,7 +39,10 @@ const F = {
   },
   emits: ["update:modelValue"],
   setup(r, { emit: m }) {
-    const a = r, o = m, p = n(() => a.multiple ? C : N), f = n(() => {
+    const a = r, i = m, p = o(() => a.multiple ? F : N), f = o(() => {
+      const e = I();
+      return (e == null ? void 0 : e.hiddenFields) || [];
+    }), c = o(() => {
       if (!a.modelValue)
         return "";
       if (!a.multiple && typeof a.modelValue == "object" && !Array.isArray(a.modelValue)) {
@@ -50,7 +54,7 @@ const F = {
       } else if (!a.multiple && typeof a.modelValue == "string")
         return a.modelValue;
       return "";
-    }), s = n({
+    }), s = o({
       get() {
         return !a.multiple || !Array.isArray(a.modelValue) ? [] : a.modelValue.map((e) => {
           if (e.label)
@@ -62,28 +66,30 @@ const F = {
       set(e) {
         if (Array.isArray(a.modelValue)) {
           const l = a.modelValue.filter((t) => {
-            const i = t.label || (() => {
+            const n = t.label || (() => {
               const u = a.availableFields.find(
                 (y) => y.id === t.value
               );
               return (u == null ? void 0 : u.label) || (u == null ? void 0 : u.fieldName) || t.value;
             })();
-            return e.includes(i);
+            return e.includes(n);
           });
-          o("update:modelValue", l);
+          i("update:modelValue", l);
         }
       }
-    }), d = n({
+    }), d = o({
       get() {
-        return a.multiple ? s.value : f.value;
+        return a.multiple ? s.value : c.value;
       },
       set(e) {
-        a.multiple && Array.isArray(e) ? s.value = e : !a.multiple && typeof e == "string" && o("update:modelValue", e);
+        a.multiple && Array.isArray(e) ? s.value = e : !a.multiple && typeof e == "string" && i("update:modelValue", e);
       }
-    }), c = (e) => {
+    }), v = (e) => {
       let l = null;
       if (e.type === "field") {
-        const t = a.availableFields.find((i) => i.id === e.value);
+        const t = [...a.availableFields, ...f.value].find(
+          (n) => n.id === e.value
+        );
         l = {
           label: `\${${(t == null ? void 0 : t.label) || (t == null ? void 0 : t.fieldName) || e.value}}`,
           type: "field",
@@ -91,7 +97,7 @@ const F = {
         };
       } else
         e.type === "userInfo" ? l = {
-          label: `\${用户信息: ${v(e.value)}}`,
+          label: `\${用户信息: ${b(e.value)}}`,
           type: "userInfo",
           value: e.value
         } : e.type === "urlParam" && (l = {
@@ -102,10 +108,10 @@ const F = {
       if (l)
         if (a.multiple) {
           const t = Array.isArray(a.modelValue) ? a.modelValue : [];
-          t.some((u) => u.value === l.value) || o("update:modelValue", [...t, l]);
+          t.some((u) => u.value === l.value) || i("update:modelValue", [...t, l]);
         } else
-          o("update:modelValue", l);
-    }, v = (e) => ({
+          i("update:modelValue", l);
+    }, b = (e) => ({
       userCode: "用户编号",
       userName: "用户名称",
       roleCode: "角色编号",
@@ -113,7 +119,7 @@ const F = {
       orgCode: "机构编号",
       orgName: "机构名称"
     })[e] || e;
-    return (e, l) => (b(), V(g(p.value), {
+    return (e, l) => (V(), g(A(p.value), {
       modelValue: d.value,
       "onUpdate:modelValue": l[0] || (l[0] = (t) => d.value = t),
       placeholder: r.placeholder,
@@ -126,17 +132,17 @@ const F = {
       class: "value-selector-input",
       size: "small"
     }, {
-      suffix: A(() => [
-        x(I, {
+      suffix: x(() => [
+        C(h, {
           "available-fields": r.availableFields,
           disabled: r.disabled,
-          onConfirm: c
+          onConfirm: v
         }, null, 8, ["available-fields", "disabled"])
       ]),
       _: 1
     }, 8, ["modelValue", "placeholder", "disabled", "readonly", "trigger"]));
   }
-}, j = /* @__PURE__ */ B(F, [["__scopeId", "data-v-e62accf1"]]);
+}, D = /* @__PURE__ */ B($, [["__scopeId", "data-v-a452b81a"]]);
 export {
-  j as default
+  D as default
 };

package/es/src/components/ValueSelectorPopover.vue2.js

@@ -36,6 +36,7 @@ const Y = { class: "value-selector-tabs" }, Z = { class: "field-group-label" },
       const o = q();
       return (o == null ? void 0 : o.hiddenFields) || [];
     }), S = y(() => {
+      debugger;
       const o = (_.availableFields || []).filter(
         (n) => !n.isHidden
       ), e = $.value.map((n) => ({
@@ -257,7 +258,7 @@ const Y = { class: "value-selector-tabs" }, Z = { class: "field-group-label" },
       }, 8, ["visible"]);
     };
   }
-}, Ie = /* @__PURE__ */ G(te, [["__scopeId", "data-v-aa614827"]]);
+}, Ie = /* @__PURE__ */ G(te, [["__scopeId", "data-v-e34dd724"]]);
 export {
   Ie as default
 };

package/es/src/layout/aside/index.vue.js

@@ -3,44 +3,46 @@ import "../../../node_modules/element-plus/theme-chalk/el-aside.css.js";
 import "../../../node_modules/element-plus/theme-chalk/el-badge.css.js";
 import "../../../node_modules/element-plus/theme-chalk/el-collapse.css.js";
 import "../../../node_modules/element-plus/theme-chalk/el-collapse-item.css.js";
-import { computed as u, ref as g, openBlock as s, createBlock as m, withCtx as a, createElementVNode as l, createVNode as n, createElementBlock as d, Fragment as D, renderList as k, unref as c, toDisplayString as b, createCommentVNode as p } from "vue";
-import { useStore as S } from "vuex";
+import { computed as u, ref as g, openBlock as s, createBlock as c, withCtx as a, createElementVNode as l, createVNode as n, createElementBlock as d, Fragment as E, renderList as k, unref as m, toDisplayString as b, createCommentVNode as p } from "vue";
+import { useStore as $ } from "vuex";
 import x from "../../packages/utils/eventBus.js";
-import { VueDraggable as L } from "../../../node_modules/vue-draggable-plus/dist/vue-draggable-plus.js";
-import { Calendar as R, DeleteFilled as $, Hide as j } from "../../../node_modules/@element-plus/icons-vue/dist/index.js";
-import { getEditConfigData as C, setSelectedItem as q } from "../../packages/utils/common.js";
-import z from "../../packages/table/aside/index.js";
-import G from "../../packages/form/aside/index.js";
-import J from "../../packages/form/fieldRecycleBin.vue.js";
-import K from "../../packages/form/HiddenFieldDialog.vue.js";
+import { VueDraggable as j } from "../../../node_modules/vue-draggable-plus/dist/vue-draggable-plus.js";
+import { Calendar as q, DeleteFilled as z, Hide as G } from "../../../node_modules/@element-plus/icons-vue/dist/index.js";
+import { getEditConfigData as C, setSelectedItem as J } from "../../packages/utils/common.js";
+import K from "../../packages/table/aside/index.js";
+import O from "../../packages/form/aside/index.js";
+import P from "../../packages/form/fieldRecycleBin.vue.js";
+import Q from "../../packages/form/HiddenFieldDialog.vue.js";
+import { throttle as W } from "../../../node_modules/@vexip-ui/utils/dist/index.js";
 import "./index.vue2.js";
-import O from "../../../_virtual/_plugin-vue_export-helper.js";
-import { ElIcon as P } from "../../../node_modules/element-plus/es/components/icon/index.js";
-import { ElCollapseItem as Q, ElCollapse as W } from "../../../node_modules/element-plus/es/components/collapse/index.js";
-import { ElBadge as X } from "../../../node_modules/element-plus/es/components/badge/index.js";
-import { ElAside as Y } from "../../../node_modules/element-plus/es/components/container/index.js";
-const Z = { class: "dev-designer-aside" }, ee = { class: "components-item" }, te = { class: "menu-components-item" }, oe = { class: "components-item-label" }, le = {
+import X from "../../../_virtual/_plugin-vue_export-helper.js";
+import { ElIcon as Y } from "../../../node_modules/element-plus/es/components/icon/index.js";
+import { ElCollapseItem as Z, ElCollapse as ee } from "../../../node_modules/element-plus/es/components/collapse/index.js";
+import { ElBadge as te } from "../../../node_modules/element-plus/es/components/badge/index.js";
+import { ElAside as oe } from "../../../node_modules/element-plus/es/components/container/index.js";
+const le = { class: "dev-designer-aside" }, ne = { class: "components-item" }, se = { class: "menu-components-item" }, ae = { class: "components-item-label" }, ie = {
   key: 0,
   class: "table-item"
-}, ne = { class: "widgets" }, se = { class: "field-label" }, ae = {
+}, re = { class: "widgets" }, de = { class: "field-label" }, me = {
   key: 0,
   class: "aside-footer"
-}, ie = {
+}, ue = {
   __name: "index",
-  setup(de) {
-    const r = S(), B = u(() => {
-      switch (r.getters.editingType) {
+  emits: ["onFormDragMove"],
+  setup(ce, { emit: B }) {
+    const S = B, i = $(), T = u(() => {
+      switch (i.getters.editingType) {
         case "table":
-          return z;
+          return K;
         case "form":
-          return G;
+          return O;
       }
       return null;
-    }), V = u(() => r.getters.editingType), y = g(["basic", "advanced"]), f = g(!1), _ = g(!1), h = u(() => {
+    }), V = u(() => i.getters.editingType), y = g(["basic", "advanced"]), f = g(!1), _ = g(!1), F = u(() => {
       var e;
       const t = C();
       return ((e = t == null ? void 0 : t.deletedFields) == null ? void 0 : e.length) || 0;
-    }), E = u(() => {
+    }), h = u(() => {
       var e;
       const t = C();
       return ((e = t == null ? void 0 : t.hiddenFields) == null ? void 0 : e.length) || 0;
@@ -52,64 +54,66 @@ const Z = { class: "dev-designer-aside" }, ee = { class: "components-item" }, te
         type: "widgets"
       };
     }
-    function N(t) {
-      q(t.clonedData), r.getters.editingType == "form" && x.emit("onFormDragEnd", t);
+    function M(t) {
+      J(t.clonedData), i.getters.editingType == "form" && x.emit("onFormDragEnd", t);
     }
-    function T(t) {
-      return r.getters.editingType == "form" && x.emit("onFormDragMove", t), !0;
+    const N = W((t) => (i.getters.editingType == "form" && S("onFormDragMove", t), !0), 50);
+    function U(t) {
+      i.getters.editingType == "form" && x.emit("onFormDragStart", t);
     }
-    function U() {
+    function I() {
       f.value = !0;
     }
-    function I() {
+    function A() {
       _.value = !0;
     }
     return (t, e) => {
-      const v = P, A = Q, H = W, F = X, M = Y;
-      return s(), m(M, { class: "root-aside" }, {
+      const v = Y, H = Z, L = ee, D = te, R = oe;
+      return s(), c(R, { class: "root-aside" }, {
         default: a(() => [
-          l("div", Z, [
-            n(H, {
+          l("div", le, [
+            n(L, {
               modelValue: y.value,
               "onUpdate:modelValue": e[0] || (e[0] = (o) => y.value = o)
             }, {
               default: a(() => [
-                (s(!0), d(D, null, k(B.value, (o) => (s(), m(A, {
+                (s(!0), d(E, null, k(T.value, (o) => (s(), c(H, {
                   title: o.title,
                   name: o.name
                 }, {
                   default: a(() => [
-                    n(c(L), {
+                    n(m(j), {
                       modelValue: o.children,
-                      "onUpdate:modelValue": (i) => o.children = i,
+                      "onUpdate:modelValue": (r) => o.children = r,
                       animation: 150,
                       ghostClass: "ghost",
                       group: { name: "dev", pull: "clone", put: !1 },
                       clone: w,
-                      onEnd: N,
-                      onMove: T,
+                      onEnd: M,
+                      onMove: m(N),
+                      onStart: U,
                       sort: !1,
                       class: "components-list"
                     }, {
                       default: a(() => [
-                        (s(!0), d(D, null, k(o.children, (i) => (s(), d("div", ee, [
-                          l("div", te, [
+                        (s(!0), d(E, null, k(o.children, (r) => (s(), d("div", ne, [
+                          l("div", se, [
                             n(v, { class: "components-item-icon" }, {
                               default: a(() => [
-                                n(c(R))
+                                n(m(q))
                               ]),
                               _: 1
                             }),
-                            l("span", oe, b(i.label), 1)
+                            l("span", ae, b(r.label), 1)
                           ]),
-                          V.value == "table" ? (s(), d("div", le, [
-                            l("div", ne, b(i.label), 1),
-                            l("div", se, b(i.fieldName), 1)
+                          V.value == "table" ? (s(), d("div", ie, [
+                            l("div", re, b(r.label), 1),
+                            l("div", de, b(r.fieldName), 1)
                           ])) : p("", !0)
                         ]))), 256))
                       ]),
                       _: 2
-                    }, 1032, ["modelValue", "onUpdate:modelValue"])
+                    }, 1032, ["modelValue", "onUpdate:modelValue", "onMove"])
                   ]),
                   _: 2
                 }, 1032, ["title", "name"]))), 256))
@@ -117,21 +121,21 @@ const Z = { class: "dev-designer-aside" }, ee = { class: "components-item" }, te
               _: 1
             }, 8, ["modelValue"])
           ]),
-          V.value == "form" ? (s(), d("div", ae, [
+          V.value == "form" ? (s(), d("div", me, [
             l("div", {
               class: "footer-btn recycle-btn",
-              onClick: U
+              onClick: I
             }, [
               n(v, { class: "btn-icon" }, {
                 default: a(() => [
-                  n(c($))
+                  n(m(z))
                 ]),
                 _: 1
               }),
               e[3] || (e[3] = l("span", { class: "btn-text" }, "字段回收站", -1)),
-              h.value > 0 ? (s(), m(F, {
+              F.value > 0 ? (s(), c(D, {
                 key: 0,
-                value: h.value,
+                value: F.value,
                 max: 99,
                 class: "btn-badge"
               }, null, 8, ["value"])) : p("", !0)
@@ -139,28 +143,28 @@ const Z = { class: "dev-designer-aside" }, ee = { class: "components-item" }, te
             e[5] || (e[5] = l("div", { class: "footer-divider" }, null, -1)),
             l("div", {
               class: "footer-btn hidden-field-btn",
-              onClick: I
+              onClick: A
             }, [
               n(v, { class: "btn-icon" }, {
                 default: a(() => [
-                  n(c(j))
+                  n(m(G))
                 ]),
                 _: 1
               }),
               e[4] || (e[4] = l("span", { class: "btn-text" }, "隐藏域", -1)),
-              E.value > 0 ? (s(), m(F, {
+              h.value > 0 ? (s(), c(D, {
                 key: 0,
-                value: E.value,
+                value: h.value,
                 max: 99,
                 class: "btn-badge"
               }, null, 8, ["value"])) : p("", !0)
             ])
           ])) : p("", !0),
-          n(J, {
+          n(P, {
             modelValue: f.value,
             "onUpdate:modelValue": e[1] || (e[1] = (o) => f.value = o)
           }, null, 8, ["modelValue"]),
-          n(K, {
+          n(Q, {
             modelValue: _.value,
             "onUpdate:modelValue": e[2] || (e[2] = (o) => _.value = o)
           }, null, 8, ["modelValue"])
@@ -169,7 +173,7 @@ const Z = { class: "dev-designer-aside" }, ee = { class: "components-item" }, te
       });
     };
   }
-}, Ne = /* @__PURE__ */ O(ie, [["__scopeId", "data-v-6873d89a"]]);
+}, Ie = /* @__PURE__ */ X(ue, [["__scopeId", "data-v-4e1d5565"]]);
 export {
-  Ne as default
+  Ie as default
 };

package/es/src/layout/index.vue.js

@@ -1,97 +1,134 @@
 import "../../node_modules/element-plus/theme-chalk/base.css.js";
+import "../../node_modules/element-plus/theme-chalk/el-result.css.js";
+import "../../node_modules/element-plus/theme-chalk/el-button.css.js";
 import "../../node_modules/element-plus/theme-chalk/el-container.css.js";
 import "../../node_modules/element-plus/theme-chalk/el-aside.css.js";
 import "../../node_modules/element-plus/theme-chalk/el-footer.css.js";
 import "../../node_modules/element-plus/theme-chalk/el-header.css.js";
 import "../../node_modules/element-plus/theme-chalk/el-main.css.js";
 import "../../node_modules/element-plus/theme-chalk/el-config-provider.css.js";
-import { ref as l, computed as k, openBlock as u, createBlock as _, withCtx as p, createVNode as o, unref as r, resolveDynamicComponent as h, createCommentVNode as C } from "vue";
-import { useStore as b } from "vuex";
-import { useRoute as x } from "vue-router";
-import I from "./aside/index.vue.js";
-import N from "./header/index.vue.js";
-import T from "./property/index.vue.js";
-import A from "../packages/table/index.vue.js";
-import E from "../packages/form/index.vue.js";
-import O from "../../node_modules/element-plus/dist/locale/zh-cn.js";
-import { setEditConfigData as d, setSelectedItem as S, setHoverItem as B } from "../packages/utils/common.js";
+import { ref as m, computed as w, openBlock as u, createBlock as d, withCtx as r, createVNode as o, unref as p, resolveDynamicComponent as D, createElementBlock as E, createTextVNode as N, createCommentVNode as B } from "vue";
+import { useStore as T } from "vuex";
+import { useRoute as O, useRouter as R } from "vue-router";
+import A from "./aside/index.vue.js";
+import F from "./header/index.vue.js";
+import M from "./property/index.vue.js";
+import S from "../packages/table/index.vue.js";
+import V from "../packages/form/index.vue.js";
+import J from "../../node_modules/element-plus/dist/locale/zh-cn.js";
+import { setEditConfigData as v, setSelectedItem as K, setHoverItem as L } from "../packages/utils/common.js";
 import y from "../api/index.js";
-import { defaultTableConfig as w } from "../packages/table/default.js";
-import { defaultFormConfig as D } from "../packages/form/default.js";
+import { defaultTableConfig as P } from "../packages/table/default.js";
+import { defaultFormConfig as W } from "../packages/form/default.js";
 import "./index.vue2.js";
-import J from "../../_virtual/_plugin-vue_export-helper.js";
-import { ElConfigProvider as K } from "../../node_modules/element-plus/es/components/config-provider/index.js";
-import { ElMain as L, ElContainer as P } from "../../node_modules/element-plus/es/components/container/index.js";
-const V = {
+import q from "../../_virtual/_plugin-vue_export-helper.js";
+import { ElConfigProvider as z } from "../../node_modules/element-plus/es/components/config-provider/index.js";
+import { ElMain as H, ElContainer as $ } from "../../node_modules/element-plus/es/components/container/index.js";
+import { ElButton as j } from "../../node_modules/element-plus/es/components/button/index.js";
+import { ElResult as G } from "../../node_modules/element-plus/es/components/result/index.js";
+const Q = {
+  key: 1,
+  class: "init-error-container"
+}, U = {
   __name: "index",
-  setup(W) {
-    const m = b(), v = x(), c = l("table"), n = v.query.pkId || "42198dc36f73b0da3d39258d58ba2ada", s = l(!1);
-    y.login4dev().then((f) => {
-      m.commit("set_token", f.token), m.commit("set_refreshToken", f.refreshToken), n && y.getById(n).then((e) => {
-        const i = e.templateName, a = e.templateKey;
-        if (c.value = e.type, c.value === "table") {
-          const t = l({
-            pkId: n,
-            templateName: i,
+  setup(X) {
+    const l = T(), g = O(), k = R(), f = m("table"), c = g.query.pkId, n = m(0), _ = m(null);
+    function h() {
+      window.history.length > 1 ? k.back() : window.close();
+    }
+    c ? y.login4dev().then((i) => {
+      l.commit("set_token", i.token), l.commit("set_refreshToken", i.refreshToken), y.getById(c).then((e) => {
+        const s = e.templateName, a = e.templateKey;
+        if (f.value = e.type, f.value === "table") {
+          const t = m({
+            pkId: c,
+            templateName: s,
             templateKey: a,
-            ...w,
+            ...P,
             ...JSON.parse(e.context)
           });
-          d(t.value), s.value = !0;
-        } else if (c.value === "form") {
-          const t = l({
-            pkId: n,
-            templateName: i,
+          v(t.value), n.value = 1;
+        } else if (f.value === "form") {
+          const t = m({
+            pkId: c,
+            templateName: s,
             templateKey: a,
-            ...D,
+            ...W,
             ...JSON.parse(e.context)
           });
-          d(t.value), s.value = !0;
+          v(t.value), n.value = 1;
         }
-        m.commit("set_editing_type", e.type);
+        l.commit("set_editing_type", e.type);
       });
-    });
-    const g = k(() => {
-      switch (m.getters.editingType) {
+    }) : n.value = -1;
+    const b = w(() => {
+      switch (l.getters.editingType) {
         case "table":
-          return A;
+          return S;
         case "form":
-          return E;
+          return V;
       }
       return null;
     });
-    return S(null), B(null), (f, e) => {
-      const i = K, a = L, t = P;
-      return s.value ? (u(), _(t, {
+    K(null), L(null);
+    function x(i) {
+      var e;
+      (e = _.value) == null || e.onFormDragMove(i);
+    }
+    return (i, e) => {
+      const s = z, a = H, t = $, C = j, I = G;
+      return n.value == 1 ? (u(), d(t, {
         key: 0,
         style: { "flex-direction": "column", height: "100%" }
       }, {
-        default: p(() => [
-          o(r(N)),
+        default: r(() => [
+          o(p(F)),
           o(t, { class: "inner-container" }, {
-            default: p(() => [
-              o(r(I)),
+            default: r(() => [
+              o(p(A), { onOnFormDragMove: x }),
               o(a, { class: "root-main" }, {
-                default: p(() => [
-                  o(i, { locale: r(O) }, {
-                    default: p(() => [
-                      (u(), _(h(r(g))))
+                default: r(() => [
+                  o(s, { locale: p(J) }, {
+                    default: r(() => [
+                      (u(), d(D(b.value), {
+                        ref_key: "compRef",
+                        ref: _
+                      }, null, 512))
                     ]),
                     _: 1
                   }, 8, ["locale"])
                 ]),
                 _: 1
               }),
-              o(r(T))
+              o(p(M))
             ]),
             _: 1
           })
         ]),
         _: 1
-      })) : C("", !0);
+      })) : n.value == -1 ? (u(), E("div", Q, [
+        o(I, {
+          icon: "warning",
+          title: "缺少模板ID",
+          "sub-title": "请提供有效的模板ID(pkId)参数"
+        }, {
+          extra: r(() => [
+            o(C, {
+              type: "primary",
+              onClick: h
+            }, {
+              default: r(() => [...e[0] || (e[0] = [
+                N("返回", -1)
+              ])]),
+              _: 1
+            })
+          ]),
+          _: 1
+        })
+      ])) : B("", !0);
     };
   }
-}, ce = /* @__PURE__ */ J(V, [["__scopeId", "data-v-ea04c802"]]);
+}, De = /* @__PURE__ */ q(U, [["__scopeId", "data-v-9ea74b78"]]);
 export {
-  ce as default
+  De as default
 };