@kp-ui/lowcode 2.14.0-beta.1 → 2.14.0-beta.2

package/install.js

@@ -1,34 +1,35 @@
 /* empty css                       */
-import { i18n as n } from "./src/utils/i18n.js";
+import { i18n as d } from "./src/utils/i18n.js";
 import "./_virtual/virtual_svg-icons-register.js";
-import { addAdvancedFieldSchema as h, addBasicFieldSchema as w, addContainerWidgetSchema as C, addCustomWidgetSchema as F } from "./src/components/form-designer/widget-panel/widgetsConfig.js";
-import { basicFieldsEnums as S } from "./src/components/form-designer/widget-panel/basicFieldsEnums.js";
-import { default as R } from "./src/components/form-designer/index.vue.js";
-import { default as W } from "./src/components/form-render/index.vue.js";
+import { addAdvancedFieldSchema as w, addBasicFieldSchema as F, addContainerWidgetSchema as P, addCustomWidgetSchema as S } from "./src/components/form-designer/widget-panel/widgetsConfig.js";
+import { basicFieldsEnums as R } from "./src/components/form-designer/widget-panel/basicFieldsEnums.js";
+import { default as M } from "./src/components/form-designer/index.vue.js";
+import { default as y } from "./src/components/form-render/index.vue.js";
 import s from "./src/components/form-designer/form-widget/container-widget/index.js";
-import { openCustomerModal as p } from "./src/components/public/CustomerModal/useCustomerModal.js";
-import { default as A } from "./src/components/form-render/SubmitButtonRender.vue.js";
-import { default as I } from "./src/utils/emitter.js";
-import { useLowcode as U } from "./src/hooks/useLowcode.js";
-const $ = (r) => {
-  const { app: o, http: e, factoryRender: t, useMountApp: i, getUserInfo: a } = r;
-  o.config.globalProperties.$http = e, o.config.globalProperties.$getUserInfo = a, o.config.globalProperties.$factoryRender = t, o.config.globalProperties.$i18n = n.$st, o.config.globalProperties.$openCustomerModal = (m) => p(m, i), o.use(s);
-  const d = window.$vform ?? {};
+import p from "./src/components/form-render/container-item/index.js";
+import { openCustomerModal as f } from "./src/components/public/CustomerModal/useCustomerModal.js";
+import { default as B } from "./src/components/form-render/SubmitButtonRender.vue.js";
+import { default as U } from "./src/utils/emitter.js";
+import { useLowcode as D } from "./src/hooks/useLowcode.js";
+const b = (r) => {
+  const { app: o, http: e, factoryRender: t, useMountApp: i, getUserInfo: m } = r;
+  o.config.globalProperties.$http = e, o.config.globalProperties.$getUserInfo = m, o.config.globalProperties.$factoryRender = t, o.config.globalProperties.$i18n = d.$st, o.config.globalProperties.$openCustomerModal = (n) => f(n, i), o.use(s), o.use(p);
+  const a = window.$vform ?? {};
   window.$vform = {
-    ...d,
+    ...a,
     $http: e
   };
 };
 export {
-  A as SubmitButtonRender,
-  R as VFormDesigner,
-  W as VFormRender,
-  h as addAdvancedFieldSchema,
-  w as addBasicFieldSchema,
-  C as addContainerWidgetSchema,
-  F as addCustomWidgetSchema,
-  S as basicFieldsEnums,
-  I as emitter,
-  $ as registerLowcodeCore,
-  U as useLowcode
+  B as SubmitButtonRender,
+  M as VFormDesigner,
+  y as VFormRender,
+  w as addAdvancedFieldSchema,
+  F as addBasicFieldSchema,
+  P as addContainerWidgetSchema,
+  S as addCustomWidgetSchema,
+  R as basicFieldsEnums,
+  U as emitter,
+  b as registerLowcodeCore,
+  D as useLowcode
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kp-ui/lowcode",
-  "version": "2.14.0-beta.1",
+  "version": "2.14.0-beta.2",
   "publishConfig": {
     "access": "public"
   },
@@ -9,7 +9,7 @@
     "@kp-ui/i18n": "0.0.12",
     "@kp-ui/tool": "1.0.33",
     "@surely-vue/table": "5.0.3",
-    "ace-builds": "1.42.0",
+    "ace-builds": "1.43.4",
     "animate.css": "^4.1.1",
     "ant-design-vue": "4.2.6",
     "axios": "^1.3.5",

package/src/components/form-designer/form-widget/field-widget/diy-compontent-widget.vue.js

@@ -63,7 +63,7 @@ const x = {
         context: this,
         params: { data: this.fieldModel },
         keys: ["data"]
-      });
+      }) ?? "";
     }
   }
 }, g = { class: "slot-wrapper-render" };

package/src/components/form-designer/index.vue.js

@@ -1,23 +1,23 @@
-import C from "./widget-panel/index.vue.js";
-import v from "./toolbar-panel/index.vue.js";
-import F from "./setting-panel/index.vue.js";
-import w from "./form-widget/index.vue.js";
-import { createDesigner as b } from "./designer.js";
-import { traverseAllWidgets as y, getAllContainerWidgets as f, getAllFieldWidgets as c, deepClone as m, addWindowResizeHandler as R } from "../../utils/util.js";
-import x from "../../utils/i18n.js";
-import { isEmpty as J } from "lodash-es";
-import { resolveComponent as o, createBlock as A, openBlock as D, withCtx as n, createVNode as r, createSlots as S, renderList as V, renderSlot as H, createElementVNode as B } from "vue";
+import v from "./widget-panel/index.vue.js";
+import F from "./toolbar-panel/index.vue.js";
+import w from "./setting-panel/index.vue.js";
+import b from "./form-widget/index.vue.js";
+import { createDesigner as y } from "./designer.js";
+import { traverseAllWidgets as R, getAllContainerWidgets as c, getAllFieldWidgets as m, deepClone as u, addWindowResizeHandler as x } from "../../utils/util.js";
+import J from "../../utils/i18n.js";
+import { isEmpty as A } from "lodash-es";
+import { resolveComponent as n, createBlock as D, openBlock as S, withCtx as o, createVNode as r, createSlots as V, renderList as H, renderSlot as B, createElementVNode as E } from "vue";
 /* empty css           */
-import E from "../../../_virtual/_plugin-vue_export-helper.js";
-const N = {
+import N from "../../../_virtual/_plugin-vue_export-helper.js";
+const P = {
   name: "VFormDesigner",
   componentName: "VFormDesigner",
-  mixins: [x],
+  mixins: [J],
   components: {
-    WidgetPanel: C,
-    ToolbarPanel: v,
-    SettingPanel: F,
-    VFormWidget: w
+    WidgetPanel: v,
+    ToolbarPanel: F,
+    SettingPanel: w,
+    VFormWidget: b
   },
   props: {
     /* 保存jsonApi */
@@ -80,7 +80,7 @@ const N = {
       //是否正在加载中
       caseName: "",
       scrollerHeight: 0,
-      designer: b(this),
+      designer: y(this),
       fieldList: []
     };
   },
@@ -94,7 +94,7 @@ const N = {
   created() {
   },
   mounted() {
-    this.initLocale(), this.scrollerHeight = window.innerHeight - 56 - 36 + "px", R(() => {
+    this.initLocale(), this.scrollerHeight = window.innerHeight - 56 - 36 + "px", x(() => {
       this.$nextTick(() => {
         this.scrollerHeight = window.innerHeight - 56 - 36 + "px";
       });
@@ -123,7 +123,7 @@ const N = {
      * @param {*} importObj
      */
     setJsonImport(e = {}) {
-      if (!J(e))
+      if (!A(e))
         try {
           if (!e || !e.formConfig)
             throw new Error(this.i18nt("designer.hint.invalidJsonFormat"));
@@ -145,8 +145,8 @@ const N = {
     },
     getFormJson() {
       return {
-        widgetList: m(this.designer.widgetList),
-        formConfig: m(this.designer.formConfig)
+        widgetList: u(this.designer.widgetList),
+        formConfig: u(this.designer.formConfig)
       };
     },
     clearDesigner() {
@@ -181,14 +181,14 @@ const N = {
      * @returns {*[]}
      */
     getFieldWidgets(e = null) {
-      return e ? c(e) : c(this.designer.widgetList);
+      return e ? m(e) : m(this.designer.widgetList);
     },
     /**
      * 获取所有容器组件
      * @returns {*[]}
      */
     getContainerWidgets(e = null) {
-      return e ? f(e) : f(this.designer.widgetList);
+      return e ? c(e) : c(this.designer.widgetList);
     },
     /**
      * 升级表单json，以补充最新的组件属性
@@ -199,7 +199,7 @@ const N = {
         this.$message.error("Invalid form json!");
         return;
       }
-      return y(e.widgetList, (t) => {
+      return R(e.widgetList, (t) => {
         this.designer.upgradeWidgetConfig(t);
       }), this.designer.upgradeFormConfig(e.formConfig), e;
     },
@@ -242,50 +242,50 @@ const N = {
     }
     //TODO: 增加更多方法！！
   }
-}, P = { class: "container-scroll-bar" };
-function k(e, t, s, M, i, l) {
-  const u = o("WidgetPanel"), d = o("a-layout-sider"), p = o("toolbar-panel"), W = o("a-layout-header"), _ = o("VFormWidget"), a = o("a-layout-content"), L = o("setting-panel"), g = o("a-layout");
-  return D(), A(g, { class: "main-container full-height" }, {
-    default: n(() => [
-      r(g, null, {
-        default: n(() => [
-          r(d, {
+}, k = { class: "container-scroll-bar" };
+function M(e, t, s, j, i, d) {
+  const p = n("WidgetPanel"), l = n("a-layout-sider"), W = n("toolbar-panel"), _ = n("a-layout-header"), L = n("VFormWidget"), g = n("a-layout-content"), C = n("setting-panel"), a = n("a-layout");
+  return S(), D(a, { class: "main-container full-height" }, {
+    default: o(() => [
+      r(a, null, {
+        default: o(() => [
+          r(l, {
             width: i.leftWidth,
             class: "side-panel"
           }, {
-            default: n(() => [
-              r(u, { designer: i.designer }, null, 8, ["designer"])
+            default: o(() => [
+              r(p, { designer: i.designer }, null, 8, ["designer"])
             ]),
             _: 1
           }, 8, ["width"]),
-          r(a, { class: "center-layout-container" }, {
-            default: n(() => [
-              r(W, { class: "toolbar-header" }, {
-                default: n(() => [
-                  r(p, {
+          r(g, { class: "center-layout-container" }, {
+            default: o(() => [
+              r(_, { class: "toolbar-header" }, {
+                default: o(() => [
+                  r(W, {
                     saveJsonApi: s.saveJsonApi,
                     designer: i.designer,
                     "global-dsv": s.globalDsv,
-                    changeLeftWidth: l.changeLeftWidth,
-                    changeRightWidth: l.changeRightWidth,
+                    changeLeftWidth: d.changeLeftWidth,
+                    changeRightWidth: d.changeRightWidth,
                     leftWidth: i.leftWidth,
                     rightWidth: i.rightWidth,
                     ref: "toolbarRef"
-                  }, S({ _: 2 }, [
-                    V(e.$slots, (j, h) => ({
-                      name: h,
-                      fn: n(() => [
-                        H(e.$slots, h)
+                  }, V({ _: 2 }, [
+                    H(e.$slots, (h, f) => ({
+                      name: f,
+                      fn: o(() => [
+                        B(e.$slots, f)
                       ])
                     }))
                   ]), 1032, ["saveJsonApi", "designer", "global-dsv", "changeLeftWidth", "changeRightWidth", "leftWidth", "rightWidth"])
                 ]),
                 _: 3
               }),
-              r(a, { class: "form-widget-main" }, {
-                default: n(() => [
-                  B("div", P, [
-                    r(_, {
+              r(g, { class: "form-widget-main" }, {
+                default: o(() => [
+                  E("div", k, [
+                    r(L, {
                       designer: i.designer,
                       "form-config": i.designer.formConfig,
                       "global-dsv": s.globalDsv,
@@ -298,11 +298,12 @@ function k(e, t, s, M, i, l) {
             ]),
             _: 3
           }),
-          r(d, { width: i.rightWidth }, {
-            default: n(() => [
-              r(L, {
+          r(l, { width: i.rightWidth }, {
+            default: o(() => [
+              r(C, {
                 designer: i.designer,
                 "selected-widget": i.designer.selectedWidget,
+                "onUpdate:selectedWidget": t[0] || (t[0] = (h) => i.designer.selectedWidget = h),
                 "global-dsv": s.globalDsv,
                 "form-config": i.designer.formConfig
               }, null, 8, ["designer", "selected-widget", "global-dsv", "form-config"])
@@ -316,7 +317,7 @@ function k(e, t, s, M, i, l) {
     _: 3
   });
 }
-const Z = /* @__PURE__ */ E(N, [["render", k]]);
+const Z = /* @__PURE__ */ N(P, [["render", M]]);
 export {
   Z as default
 };

package/src/components/form-designer/setting-panel/form-crud-setting.vue.js

@@ -1,38 +1,77 @@
-import { defineComponent as s, useModel as d, createElementBlock as m, openBlock as f, createVNode as r, unref as t } from "vue";
-import n from "../../http-editor/index.vue.js";
-import { useI18n as p } from "../../../utils/i18n.js";
-const u = { class: "t-p-[10px]" }, _ = /* @__PURE__ */ s({
+import { defineComponent as f, useModel as v, ref as m, reactive as g, watch as b, createElementBlock as C, openBlock as c, Fragment as w, createElementVNode as h, createVNode as n, unref as i } from "vue";
+import p from "../../http-editor/index.vue.js";
+import { HttpEditor as H } from "tmgc2-share";
+import { useI18n as L } from "../../../utils/i18n.js";
+import "lodash-es";
+const M = { class: "t-p-[10px]" }, _ = /* @__PURE__ */ f({
   __name: "form-crud-setting",
   props: {
     formConfig: {
       type: Object,
       default: () => ({
         serveList: {
-          vformUpdate: {},
-          vformDetail: {}
+          vformUpdate: {
+            http: { url: "", method: "get", params: {}, data: {} },
+            dataReqHandlerCode: "",
+            dataHandlerCode: ""
+          },
+          vformDetail: {
+            http: { url: "", method: "get", params: {}, data: {} },
+            dataReqHandlerCode: "",
+            dataHandlerCode: ""
+          },
+          list: []
         }
       })
     },
     formConfigModifiers: {}
   },
   emits: ["update:formConfig"],
-  setup(l) {
-    const { i18nt: e } = p(), o = d(l, "formConfig");
-    return (v, i) => (f(), m("div", u, [
-      r(n, {
-        label: t(e)("designer.hint.表单编辑api"),
-        buttonName: t(e)("designer.setting.edit"),
-        drawerTitle: t(e)("表单配置"),
-        optionModel: o.value.serveList.vformUpdate,
-        "onUpdate:optionModel": i[0] || (i[0] = (a) => o.value.serveList.vformUpdate = a)
-      }, null, 8, ["label", "buttonName", "drawerTitle", "optionModel"]),
-      r(n, {
-        label: t(e)("designer.hint.表单详情API"),
-        buttonName: t(e)("designer.setting.edit"),
-        drawerTitle: t(e)("表单配置"),
-        optionModel: o.value.serveList.vformDetail
-      }, null, 8, ["label", "buttonName", "drawerTitle", "optionModel"])
-    ]));
+  setup(u) {
+    const { i18nt: a } = L(), o = v(u, "formConfig"), r = m(!1), d = g({
+      index: -1,
+      isNew: !1
+    }), l = m({
+      http: {
+        url: "",
+        method: "get",
+        params: {},
+        data: {}
+      },
+      dataReqHandlerCode: "",
+      dataHandlerCode: ""
+    });
+    return b(r, (s, e) => {
+      var t;
+      if (s === !1 && e === !0) {
+        if (!((t = l.value.http) != null && t.url))
+          return;
+        d.isNew ? (o.value.serveList.list || (o.value.serveList.list = []), o.value.serveList.list.push(l.value)) : d.index > -1 && (o.value.serveList.list[d.index] = l.value);
+      }
+    }), (s, e) => (c(), C(w, null, [
+      h("div", M, [
+        n(p, {
+          label: i(a)("designer.hint.表单编辑api"),
+          buttonName: i(a)("designer.setting.edit"),
+          drawerTitle: i(a)("表单配置"),
+          optionModel: o.value.serveList.vformUpdate,
+          "onUpdate:optionModel": e[0] || (e[0] = (t) => o.value.serveList.vformUpdate = t)
+        }, null, 8, ["label", "buttonName", "drawerTitle", "optionModel"]),
+        n(p, {
+          label: i(a)("designer.hint.表单详情API"),
+          buttonName: i(a)("designer.setting.edit"),
+          drawerTitle: i(a)("表单配置"),
+          optionModel: o.value.serveList.vformDetail
+        }, null, 8, ["label", "buttonName", "drawerTitle", "optionModel"])
+      ]),
+      n(i(H), {
+        "option-model": l.value,
+        "onUpdate:optionModel": e[1] || (e[1] = (t) => l.value = t),
+        visible: r.value,
+        "onUpdate:visible": e[2] || (e[2] = (t) => r.value = t),
+        "drawer-title": "接口配置"
+      }, null, 8, ["option-model", "visible"])
+    ], 64));
   }
 });
 export {