@king-one/form-design 0.0.28 → 0.0.30

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @king-one/form-design
 
+## 0.0.30
+
+### Patch Changes
+
+- feat: 加班配置增加时长
+
+## 0.0.29
+
+### Patch Changes
+
+- feat：重构表单数据定义,部分规则改为children
+
 ## 0.0.28
 
 ### Patch Changes

package/dist/es/index.mjs

@@ -5,19 +5,21 @@ import { useInjectDesignContext as f } from "./src/context/design.mjs";
 import { default as p } from "./src/components/form-desgin.mjs";
 import { CreateFormDesign as i } from "./src/core/index.mjs";
 import { default as l } from "./src/components/props/form-config.vue.mjs";
-import { BaseSchema as d, ExtendSchema as c, LayoutSchema as h, tempSchema as C } from "./src/config/index.mjs";
-import { onDesignFieldChange as F, onDesignInit as S } from "./src/effects/onEffects.mjs";
+import { jsonToSchema as c } from "./src/utils/schema.mjs";
+import { BaseSchema as h, ExtendSchema as C, LayoutSchema as D, tempSchema as F } from "./src/config/index.mjs";
+import { onDesignFieldChange as I, onDesignInit as j } from "./src/effects/onEffects.mjs";
 export {
-  d as BaseSchema,
+  h as BaseSchema,
   t as Carousel,
   i as CreateFormDesign,
-  c as ExtendSchema,
+  C as ExtendSchema,
   l as FormConfig,
   p as FormDesign,
   a as FormPanelItem,
-  h as LayoutSchema,
-  F as onDesignFieldChange,
-  S as onDesignInit,
-  C as tempSchema,
+  D as LayoutSchema,
+  c as jsonToSchema,
+  I as onDesignFieldChange,
+  j as onDesignInit,
+  F as tempSchema,
   f as useInjectDesignContext
 };

package/dist/es/src/components/form-material.vue.mjs

@@ -1,4 +1,4 @@
-import { defineComponent as J, ref as w, openBlock as r, createElementBlock as m, normalizeClass as p, unref as o, createElementVNode as n, createVNode as a, withCtx as l, createTextVNode as N, Fragment as T, renderList as W, toDisplayString as y, createBlock as K, createCommentVNode as u } from "vue";
+import { defineComponent as J, ref as h, openBlock as l, createElementBlock as d, normalizeClass as u, unref as o, createElementVNode as n, createVNode as a, withCtx as r, createTextVNode as N, Fragment as T, renderList as W, toDisplayString as k, createBlock as K, createCommentVNode as p } from "vue";
 import "../internal.mjs";
 import { RadioGroup as L, RadioButton as S } from "ant-design-vue";
 import $ from "vuedraggable";
@@ -14,16 +14,16 @@ const A = { class: "widget-group-name" }, H = { class: "widget-col" }, P = { cla
 }, X = { class: "widget-item-title" }, Y = { class: "template-item" }, Z = {
   key: 0,
   class: "template-item-icon"
-}, ee = { class: "template-item-name" }, pe = /* @__PURE__ */ J({
+}, ee = { class: "template-item-name" }, ue = /* @__PURE__ */ J({
   name: "FormMaterial",
   __name: "form-material",
   setup(te) {
-    const k = w(), { updateDrag: c } = M(), { b: j } = g("material"), { b: B } = g("toolbar"), { b: E } = g("widget"), { b: I } = g("temp"), f = U(), { schema: R, tempSchema: O } = f, _ = w("1");
+    const y = h(), { updateDrag: m } = M(), { b: B } = g("material"), { b: E } = g("toolbar"), { b: I } = g("widget"), { b: R } = g("temp"), f = U(), { schema: j, tempSchema: O } = f, _ = h("1");
     function z(s) {
-      const { icon: e, ...t } = s, i = JSON.parse(JSON.stringify(t)), x = D(), d = {
+      const { icon: e, ...t } = s, i = JSON.parse(JSON.stringify(t)), C = D(), c = {
         ...i,
-        name: x,
-        id: x,
+        name: C,
+        id: C,
         "x-design-props": Object.assign({
           validate: {
             status: "",
@@ -31,53 +31,48 @@ const A = { class: "widget-group-name" }, H = { class: "widget-col" }, P = { cla
           }
         }, s["x-design-props"] || {})
       };
-      if ((i.type === "array" || i.type === "object") && (d.children = []), i.key === "k-grid") {
+      if (i.key === "k-grid") {
         const b = [];
         let v = 0;
         for (; v < 2; ) {
-          const h = D();
+          const w = D();
           b.push({
             title: `栅格容器${v + 1}`,
-            name: h,
-            id: h,
+            name: w,
+            id: w,
             key: "k-grid-column",
             type: "void",
-            icon: "form-list",
             children: [],
             "x-component": "GridColumn",
             "x-decorator": "Void",
             "x-component-props": {
               span: 12
-            },
-            "x-design-props": {
-              "convert-key": "properties",
-              "convert-type": "base"
             }
           }), v++;
         }
-        d.children = b;
+        c.children = b;
       }
-      const { shared: C } = f;
-      return C.draggedContext.field = d, C.draggedContext.key = d.key, d;
+      const { shared: x } = f;
+      return x.draggedContext.field = c, x.draggedContext.key = c.key, c;
     }
     function F(s) {
       const { schema: e } = s, { shared: t } = f;
-      return t.draggedContext.field = e, t.draggedContext.key = e.key, e;
+      return t.draggedContext.field = e, t.draggedContext.key = e.key || "", e;
     }
     function G(s) {
       var e;
-      (e = k.value) == null || e.goTo(Number(s.target.value) - 1);
+      (e = y.value) == null || e.goTo(Number(s.target.value) - 1);
     }
-    return (s, e) => (r(), m(
+    return (s, e) => (l(), d(
       "div",
       {
-        class: p(o(j)())
+        class: u(o(B)())
       },
       [
         n(
           "div",
           {
-            class: p(o(B)())
+            class: u(o(E)())
           },
           [
             a(o(L), {
@@ -87,12 +82,12 @@ const A = { class: "widget-group-name" }, H = { class: "widget-col" }, P = { cla
               size: "default",
               onChange: G
             }, {
-              default: l(() => [
+              default: r(() => [
                 a(o(S), {
                   class: "toolbar-button",
                   value: "1"
                 }, {
-                  default: l(() => e[5] || (e[5] = [
+                  default: r(() => e[5] || (e[5] = [
                     N(" 组件库 ")
                   ])),
                   _: 1,
@@ -102,7 +97,7 @@ const A = { class: "widget-group-name" }, H = { class: "widget-col" }, P = { cla
                   class: "toolbar-button",
                   value: "2"
                 }, {
-                  default: l(() => e[6] || (e[6] = [
+                  default: r(() => e[6] || (e[6] = [
                     N(" 业务套件 ")
                   ])),
                   _: 1,
@@ -120,32 +115,32 @@ const A = { class: "widget-group-name" }, H = { class: "widget-col" }, P = { cla
           q,
           {
             ref_key: "carouselRef",
-            ref: k,
+            ref: y,
             "model-value": 0
           },
           {
-            default: l(() => [
+            default: r(() => [
               n(
                 "div",
                 {
-                  class: p(o(E)())
+                  class: u(o(I)())
                 },
                 [
-                  (r(!0), m(
+                  (l(!0), d(
                     T,
                     null,
-                    W(o(R), (t) => (r(), m("div", {
+                    W(o(j), (t) => (l(), d("div", {
                       key: t.key,
                       class: "widget-group"
                     }, [
                       n(
                         "div",
                         A,
-                        y(t.name),
+                        k(t.name),
                         1
                         /* TEXT */
                       ),
-                      t.widget ? (r(), K(o($), {
+                      t.widget ? (l(), K(o($), {
                         key: 0,
                         list: t.widget,
                         class: "widget-list-drag",
@@ -154,21 +149,21 @@ const A = { class: "widget-group-name" }, H = { class: "widget-col" }, P = { cla
                         sort: !1,
                         options: { animation: 150 },
                         clone: z,
-                        onStart: e[1] || (e[1] = (i) => o(c)(!0)),
-                        onEnd: e[2] || (e[2] = (i) => o(c)(!1))
+                        onStart: e[1] || (e[1] = (i) => o(m)(!0)),
+                        onEnd: e[2] || (e[2] = (i) => o(m)(!1))
                       }, {
-                        item: l(({ element: i }) => [
+                        item: r(({ element: i }) => [
                           n("div", H, [
                             n("div", P, [
-                              i.icon ? (r(), m("div", Q, [
+                              i.icon ? (l(), d("div", Q, [
                                 a(o(V), {
                                   icon: i.icon
                                 }, null, 8, ["icon"])
-                              ])) : u("v-if", !0),
+                              ])) : p("v-if", !0),
                               n(
                                 "div",
                                 X,
-                                y(i.title),
+                                k(i.title),
                                 1
                                 /* TEXT */
                               )
@@ -177,7 +172,7 @@ const A = { class: "widget-group-name" }, H = { class: "widget-col" }, P = { cla
                         ]),
                         _: 2
                         /* DYNAMIC */
-                      }, 1032, ["list"])) : u("v-if", !0)
+                      }, 1032, ["list"])) : p("v-if", !0)
                     ]))),
                     128
                     /* KEYED_FRAGMENT */
@@ -189,7 +184,7 @@ const A = { class: "widget-group-name" }, H = { class: "widget-col" }, P = { cla
               n(
                 "div",
                 {
-                  class: p(o(I)())
+                  class: u(o(R)())
                 },
                 [
                   a(o($), {
@@ -200,20 +195,20 @@ const A = { class: "widget-group-name" }, H = { class: "widget-col" }, P = { cla
                     sort: !1,
                     options: { animation: 150 },
                     clone: F,
-                    onStart: e[3] || (e[3] = (t) => o(c)(!0)),
-                    onEnd: e[4] || (e[4] = (t) => o(c)(!1))
+                    onStart: e[3] || (e[3] = (t) => o(m)(!0)),
+                    onEnd: e[4] || (e[4] = (t) => o(m)(!1))
                   }, {
-                    item: l(({ element: t }) => [
+                    item: r(({ element: t }) => [
                       n("div", Y, [
-                        t.icon ? (r(), m("div", Z, [
+                        t.icon ? (l(), d("div", Z, [
                           a(o(V), {
                             icon: t.icon
                           }, null, 8, ["icon"])
-                        ])) : u("v-if", !0),
+                        ])) : p("v-if", !0),
                         n(
                           "div",
                           ee,
-                          y(t.name),
+                          k(t.name),
                           1
                           /* TEXT */
                         )
@@ -222,7 +217,7 @@ const A = { class: "widget-group-name" }, H = { class: "widget-col" }, P = { cla
                     _: 1
                     /* STABLE */
                   }, 8, ["list"]),
-                  u(` <div class="template-list">
+                  p(` <div class="template-list">
           <div v-for="g in tempSchema" :key="g.key" class="template-item">
             <div v-if="g.icon" class="template-item-icon">
               <WidgetIcon :icon="g.icon" />
@@ -250,5 +245,5 @@ const A = { class: "widget-group-name" }, H = { class: "widget-col" }, P = { cla
   }
 });
 export {
-  pe as default
+  ue as default
 };

package/dist/es/src/components/panel/widget/grid.vue2.mjs

@@ -28,7 +28,7 @@ const V = { class: "form-item" }, J = /* @__PURE__ */ w({
       };
       if (d.hooks.syncDragAdd.call(n), !d.dragAddResult.every((e) => e)) {
         const e = a.field.children.findIndex((t) => t.id === r.id);
-        e !== -1 && (a.field.children.splice(e, 1), B.warning("不能将该控件拖拽到列表容器中"));
+        e !== -1 && (a.field.children.splice(e, 1), B.warning("不能将该控件拖拽到明细表中"));
       }
     }
     return (o, r) => (l(), g(

package/dist/es/src/components/props/widget/GridProps.vue2.mjs

@@ -1,5 +1,5 @@
-import { defineComponent as _, computed as k, openBlock as s, createBlock as y, unref as t, normalizeClass as g, withCtx as p, createVNode as n, createElementBlock as c, Fragment as h, renderList as C, createTextVNode as b } from "vue";
-import { Form as B, FormItem as u, InputNumber as d, Button as F } from "ant-design-vue";
+import { defineComponent as _, computed as k, openBlock as m, createBlock as y, unref as t, normalizeClass as g, withCtx as p, createVNode as n, createElementBlock as u, Fragment as h, renderList as C, createTextVNode as b } from "vue";
+import { Form as B, FormItem as c, InputNumber as d, Button as F } from "ant-design-vue";
 import "../../../internal.mjs";
 import { uid as N } from "@king-one/utils";
 import "../../form-icon.vue.mjs";
@@ -9,43 +9,38 @@ import U from "../../form-icon.vue2.mjs";
 const T = /* @__PURE__ */ _({
   __name: "GridProps",
   setup(V) {
-    const { b: f } = w("grid-props"), { checkedField: r } = I(), m = k(() => r.value["x-component-props"] || {});
+    const { b: f } = w("grid-props"), { checkedField: r } = I(), s = k(() => r.value["x-component-props"] || {});
     function v(l) {
       var e;
       (e = r.value.children) == null || e.splice(l, 1);
     }
     function x() {
-      var a, i;
+      var i, a;
       const l = N(), o = {
-        title: `栅格容器${(((a = r.value.children) == null ? void 0 : a.length) || 0) + 1}`,
+        title: `栅格容器${(((i = r.value.children) == null ? void 0 : i.length) || 0) + 1}`,
         name: l,
         id: l,
         key: "k-grid-column",
         type: "void",
-        icon: "form-list",
         children: [],
         "x-component": "GridColumn",
         "x-decorator": "Void",
         "x-component-props": {
           span: 12
-        },
-        "x-design-props": {
-          "convert-key": "properties",
-          "convert-type": "base"
         }
       };
-      (i = r.value.children) == null || i.push(o);
+      (a = r.value.children) == null || a.push(o);
     }
-    return (l, e) => (s(), y(t(B), {
+    return (l, e) => (m(), y(t(B), {
       layout: "vertical",
       class: g(t(f)())
     }, {
       default: p(() => [
-        n(t(u), { label: "间隔大小" }, {
+        n(t(c), { label: "间隔大小" }, {
           default: p(() => [
             n(t(d), {
-              value: m.value.gutter,
-              "onUpdate:value": e[0] || (e[0] = (o) => m.value.gutter = o),
+              value: s.value.gutter,
+              "onUpdate:value": e[0] || (e[0] = (o) => s.value.gutter = o),
               style: { width: "100%" },
               min: 1,
               precision: 0,
@@ -56,18 +51,18 @@ const T = /* @__PURE__ */ _({
           _: 1
           /* STABLE */
         }),
-        n(t(u), { label: "配置项" }, {
+        n(t(c), { label: "配置项" }, {
           default: p(() => [
-            (s(!0), c(
+            (m(!0), u(
               h,
               null,
-              C(t(r).children, (o, a) => (s(), c("div", {
+              C(t(r).children, (o, i) => (m(), u("div", {
                 key: o.id,
                 class: "col-item"
               }, [
                 n(t(d), {
                   value: o["x-component-props"].span,
-                  "onUpdate:value": (i) => o["x-component-props"].span = i,
+                  "onUpdate:value": (a) => o["x-component-props"].span = a,
                   min: 1,
                   style: { width: "200px" },
                   precision: 0,
@@ -76,7 +71,7 @@ const T = /* @__PURE__ */ _({
                 n(U, {
                   name: "delete1",
                   class: "close-icon",
-                  onClick: (i) => v(a)
+                  onClick: (a) => v(i)
                 }, null, 8, ["onClick"])
               ]))),
               128