@king-one/form-design 0.0.28 → 0.0.30

package/dist/es/src/config/index.mjs

@@ -12,10 +12,6 @@ const o = {
       "x-component-props": {
         gutter: 20
       },
-      "x-design-props": {
-        "convert-key": "properties",
-        "convert-type": "base"
-      },
       "x-decorator": "Void"
     }
   ]
@@ -117,17 +113,27 @@ const o = {
       type: e.object,
       icon: "form-area",
       "x-component": "FormArea",
-      properties: {
-        province: {
-          type: e.string
-        },
-        city: {
-          type: e.string
+      children: [
+        {
+          type: e.string,
+          name: "province"
         },
-        county: {
-          type: e.string
+        {
+          type: e.string,
+          name: "city"
         }
-      }
+      ]
+      // 'properties': {
+      //   province: {
+      //     type: valueTypeMap.string
+      //   },
+      //   city: {
+      //     type: valueTypeMap.string
+      //   },
+      //   county: {
+      //     type: valueTypeMap.string
+      //   }
+      // }
     }
   ]
 }, a = {
@@ -139,11 +145,7 @@ const o = {
       key: "k-object",
       type: e.object,
       icon: "form-object",
-      children: [],
-      "x-design-props": {
-        "convert-key": "properties",
-        "convert-type": "base"
-      }
+      children: []
     },
     {
       title: "列表容器",
@@ -152,11 +154,7 @@ const o = {
       icon: "form-list",
       children: [],
       "x-component": "ArrayCard",
-      "x-decorator": "Void",
-      "x-design-props": {
-        "convert-key": "items",
-        "convert-type": "object"
-      }
+      "x-decorator": "Void"
     },
     {
       title: "明细表",
@@ -164,12 +162,9 @@ const o = {
       type: e.array,
       icon: "form-table",
       "x-component": "ArrayTable",
+      children: [],
       "x-decorator-props": {
         labelAlign: "top"
-      },
-      "x-design-props": {
-        "convert-key": "items",
-        "convert-type": "object"
       }
     }
   ]
@@ -190,67 +185,63 @@ const o = {
           message: ""
         }
       },
-      properties: {
-        details: {
+      children: [
+        {
           type: e.array,
+          name: "details",
           title: "加班明细",
           "x-component": "ArrayCard",
           "x-decorator": "Void",
-          name: "details",
-          items: {
-            type: e.object,
-            properties: {
-              date: {
-                type: e.array,
-                title: "加班日期",
-                format: "date",
-                items: {
-                  type: e.string,
-                  format: "date"
-                },
-                name: "date",
-                "x-component": "DateRange",
-                "x-component-props": {
-                  valueFormat: "YYYY-MM-DD HH:mm:ss",
-                  showTime: !0,
-                  placeholder: [
-                    "开始日期",
-                    "结束日期"
-                  ]
-                }
+          children: [
+            {
+              type: e.array,
+              title: "加班日期",
+              items: {
+                type: e.string,
+                format: "date"
               },
-              hours: {
-                type: e.number,
-                title: "加班时长",
-                name: "hours",
-                "x-component": "InputNumber",
-                "x-component-props": {
-                  placeholder: "请输入"
-                },
-                "x-validator": [
-                  {
-                    validator: `{{const sourceValue = $parent.date
-                        if (!sourceValue || !sourceValue.length) {
-                          return true
-                        }else{
-                          const [start, end] = sourceValue
-                          const s = new Date(start)
-                          const e = new Date(end)
-                          const hoursDiff = Math.abs(e - s) / (1000 * 60 * 60)
-                          const actualHours = Math.round(hoursDiff * 100) / 100
-                          if ( $value> actualHours) {
-                            return new Error(\`不得超过\${actualHours}小时\`)
-                          }
-                          return	true
-                        }
-                      }}`
-                  }
+              name: "date",
+              "x-component": "DateRange",
+              "x-component-props": {
+                valueFormat: "YYYY-MM-DD HH:mm:ss",
+                showTime: !0,
+                placeholder: [
+                  "开始日期",
+                  "结束日期"
                 ]
               }
+            },
+            {
+              type: e.number,
+              title: "加班时长",
+              name: "hours",
+              "x-component": "InputNumber",
+              "x-component-props": {
+                placeholder: "请输入"
+              },
+              "x-validator": [
+                {
+                  validator: `{{const sourceValue = $parent.date
+                      if (!sourceValue || !sourceValue.length) {
+                        return true
+                      }else{
+                        const [start, end] = sourceValue
+                        const s = new Date(start)
+                        const e = new Date(end)
+                        const hoursDiff = Math.abs(e - s) / (1000 * 60 * 60)
+                        const actualHours = Math.round(hoursDiff * 100) / 100
+                        if ( $value> actualHours) {
+                          return new Error(\`不得超过\${actualHours}小时\`)
+                        }
+                        return	true
+                      }
+                    }}`
+                }
+              ]
             }
-          }
+          ]
         },
-        total: {
+        {
           type: e.number,
           title: "总时长",
           name: "total",
@@ -274,78 +265,163 @@ const o = {
             }
           }
         }
-      }
-    }
-  },
-  {
-    name: "请假模版",
-    key: "liveTime",
-    icon: "form-kit-liveTime",
-    schema: {
-      title: "请假模版",
-      key: "k-liveTime",
-      type: e.object,
-      name: "liveTime",
-      id: "liveTime",
-      "x-design-props": {
-        validate: {
-          status: "",
-          message: ""
-        }
-      },
-      properties: {
-        details: {
-          type: e.array,
-          title: "加班明细",
-          "x-component": "ArrayCard",
-          "x-decorator": "Void",
-          name: "details",
-          items: {
-            type: e.object,
-            properties: {
-              date: {
-                type: e.array,
-                title: "加班日期",
-                format: "date",
-                items: {
-                  type: e.string,
-                  format: "date"
-                },
-                name: "date",
-                "x-component": "DateRange",
-                "x-component-props": {
-                  valueFormat: "YYYY-MM-DD HH:mm:ss",
-                  showTime: !0,
-                  placeholder: [
-                    "开始日期",
-                    "结束日期"
-                  ]
-                }
-              },
-              hours: {
-                type: e.number,
-                title: "加班时长",
-                name: "hours",
-                "x-component": "InputNumber",
-                "x-component-props": {
-                  placeholder: "请输入"
-                }
-              }
-            }
-          }
-        },
-        total: {
-          type: e.number,
-          title: "总时长",
-          name: "total",
-          "x-component": "InputNumber",
-          "x-component-props": {
-            placeholder: "请输入"
-          }
-        }
-      }
+      ]
+      // 'properties': {
+      //   details: {
+      //     'type': valueTypeMap.array,
+      //     'title': '加班明细',
+      //     'x-component': 'ArrayCard',
+      //     'x-decorator': 'Void',
+      //     'name': 'details',
+      //     'items': {
+      //       type: valueTypeMap.object,
+      //       properties: {
+      //         date: {
+      //           'type': valueTypeMap.array,
+      //           'title': '加班日期',
+      //           'format': 'date',
+      //           'items': {
+      //             type: valueTypeMap.string,
+      //             format: 'date'
+      //           },
+      //           'name': 'date',
+      //           'x-component': 'DateRange',
+      //           'x-component-props': {
+      //             valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      //             showTime: true,
+      //             placeholder: [
+      //               '开始日期',
+      //               '结束日期'
+      //             ]
+      //           }
+      //         },
+      //         hours: {
+      //           'type': valueTypeMap.number,
+      //           'title': '加班时长',
+      //           'name': 'hours',
+      //           'x-component': 'InputNumber',
+      //           'x-component-props': {
+      //             placeholder: '请输入'
+      //           },
+      //           'x-validator': [
+      //             {
+      //               validator: `{{const sourceValue = \$parent.date
+      //                   if (!sourceValue || !sourceValue.length) {
+      //                     return true
+      //                   }else{
+      //                     const [start, end] = sourceValue
+      //                     const s = new Date(start)
+      //                     const e = new Date(end)
+      //                     const hoursDiff = Math.abs(e - s) / (1000 * 60 * 60)
+      //                     const actualHours = Math.round(hoursDiff * 100) / 100
+      //                     if ( \$value> actualHours) {
+      //                       return new Error(\`不得超过\${actualHours}小时\`)
+      //                     }
+      //                     return	true
+      //                   }
+      //                 }}`
+      //             }
+      //           ]
+      //         }
+      //       }
+      //     }
+      //   },
+      //   total: {
+      //     'type': valueTypeMap.number,
+      //     'title': '总时长',
+      //     'name': 'total',
+      //     'x-component': 'InputNumber',
+      //     'x-component-props': {
+      //       placeholder: '请输入'
+      //     },
+      //     'x-reactions': {
+      //       dependencies: [
+      //         {
+      //           property: 'value',
+      //           type: 'string',
+      //           source: '.details',
+      //           name: 'details'
+      //         }
+      //       ],
+      //       fulfill: {
+      //         state: {
+      //           value: '{{$deps.details.reduce((acc, cur) => acc + cur.hours, 0)}}'
+      //         }
+      //       }
+      //     }
+      //   }
+      // }
     }
   }
+  // {
+  //   name: '请假模版',
+  //   key: 'liveTime',
+  //   icon: 'form-kit-liveTime',
+  //   schema: {
+  //     'title': '请假模版',
+  //     'key': 'k-liveTime',
+  //     'type': valueTypeMap.object,
+  //     'name': 'liveTime',
+  //     'id': 'liveTime',
+  //     'x-design-props': {
+  //       validate: {
+  //         status: '',
+  //         message: ''
+  //       }
+  //     },
+  //     'properties': {
+  //       details: {
+  //         'type': valueTypeMap.array,
+  //         'title': '加班明细',
+  //         'x-component': 'ArrayCard',
+  //         'x-decorator': 'Void',
+  //         'name': 'details',
+  //         'items': {
+  //           type: valueTypeMap.object,
+  //           properties: {
+  //             date: {
+  //               'type': valueTypeMap.array,
+  //               'title': '加班日期',
+  //               'format': 'date',
+  //               'items': {
+  //                 type: valueTypeMap.string,
+  //                 format: 'date'
+  //               },
+  //               'name': 'date',
+  //               'x-component': 'DateRange',
+  //               'x-component-props': {
+  //                 valueFormat: 'YYYY-MM-DD HH:mm:ss',
+  //                 showTime: true,
+  //                 placeholder: [
+  //                   '开始日期',
+  //                   '结束日期'
+  //                 ]
+  //               }
+  //             },
+  //             hours: {
+  //               'type': valueTypeMap.number,
+  //               'title': '加班时长',
+  //               'name': 'hours',
+  //               'x-component': 'InputNumber',
+  //               'x-component-props': {
+  //                 placeholder: '请输入'
+  //               }
+  //             }
+  //           }
+  //         }
+  //       },
+  //       total: {
+  //         'type': valueTypeMap.number,
+  //         'title': '总时长',
+  //         'name': 'total',
+  //         'x-component': 'InputNumber',
+  //         'x-component-props': {
+  //           placeholder: '请输入'
+  //         }
+  //       }
+  //     }
+  //   }
+  // }
 ];
 export {
   r as BaseSchema,

package/dist/es/src/core/FormSchema.mjs

@@ -1,79 +1,58 @@
-var a = Object.defineProperty;
-var m = (r, t, s) => t in r ? a(r, t, { enumerable: !0, configurable: !0, writable: !0, value: s }) : r[t] = s;
-var c = (r, t, s) => m(r, typeof t != "symbol" ? t + "" : t, s);
-import { ref as f, toRaw as d } from "vue";
-import { uid as u } from "@king-one/utils";
-import { Field as y } from "./Field.mjs";
-class F {
+var l = Object.defineProperty;
+var a = (s, e, t) => e in s ? l(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t;
+var n = (s, e, t) => a(s, typeof e != "symbol" ? e + "" : e, t);
+import { ref as h, toRaw as m } from "vue";
+import { uid as c } from "@king-one/utils";
+import { Field as d } from "./Field.mjs";
+class g {
   constructor() {
-    c(this, "version", "1.0.0");
-    c(this, "fields", f([]));
+    n(this, "version", "1.0.0");
+    n(this, "fields", h([]));
   }
   getSchema() {
-    const t = d(this.fields.value);
-    console.log(t, "s");
-    const s = this.jsonToschema(t);
+    const e = m(this.fields.value), t = this.jsonToSchema(e);
     return {
       version: this.version,
       form: {
-        schema: s
+        schema: t
       }
     };
   }
   getFieldList() {
-    return this.fields.value.map((t) => new y(t));
+    return this.fields.value.map((e) => new d(e));
   }
   clearFields() {
     return this.fields.value = [];
   }
-  jsonToschema(t, s = {}) {
-    return t.forEach((i) => {
-      const e = this.omit(i, ["children"]), o = i.children || [];
-      e.type === "object" && o.length ? s[e.name] = {
-        ...e,
-        properties: this.jsonToschema(o)
-      } : e.type === "void" && o.length ? s[e.name] = {
-        ...e,
-        properties: this.jsonToschema(o)
-      } : e.type === "array" && o.length ? s[e.name] = {
-        ...e,
-        items: e.items || {
+  setFields(e) {
+    this.fields.value = e;
+  }
+  jsonToSchema(e, t = {}) {
+    return e.forEach((o) => {
+      const i = this.omit(o, ["children"]), r = o.children || [];
+      i.type === "object" && r.length ? t[i.name] = {
+        ...i,
+        properties: this.jsonToSchema(r)
+      } : i.type === "void" && r.length ? t[i.name] = {
+        ...i,
+        properties: this.jsonToSchema(r)
+      } : i.type === "array" && r.length ? t[i.name] = {
+        ...i,
+        items: i.items || {
           type: "object",
-          id: u(),
-          properties: this.jsonToschema(o)
+          id: c(),
+          properties: this.jsonToSchema(r)
         }
-      } : s[e.name] = e;
-    }), s;
-  }
-  /**
-   * 将 schema 对象格式还原为数组格式
-   * @param schema schema 对象
-   * @returns FieldSchema[] 数组格式
-   */
-  schemaToJson(t) {
-    const s = [];
-    return Object.keys(t).forEach((i) => {
-      var h;
-      const e = t[i], o = e["x-design-props"], l = o == null ? void 0 : o["convert-key"], p = o == null ? void 0 : o["convert-type"];
-      if (!l || !p) {
-        s.push(e);
-        return;
-      }
-      const n = this.omit(e, ["properties", "items"]);
-      e.type === "object" || e.type === "void" ? n.children = e.properties ? this.schemaToJson(e.properties) : [] : e.type === "array" && ((h = e.items) != null && h.properties) && (n.children = this.schemaToJson(e.items.properties)), s.push(n);
-    }), s;
+      } : t[i.name] = i;
+    }), t;
   }
-  setFields(t) {
-    const s = this.schemaToJson(t);
-    this.fields.value = s;
-  }
-  omit(t, s) {
-    const i = { ...t };
-    return s.forEach((e) => {
-      delete i[e];
-    }), i;
+  omit(e, t) {
+    const o = { ...e };
+    return t.forEach((i) => {
+      delete o[i];
+    }), o;
   }
 }
 export {
-  F as FormSchema
+  g as FormSchema
 };

package/dist/es/src/index.mjs

@@ -1,19 +1,20 @@
 import "./components/base/Carousel.vue2.mjs";
 import "./components/panel/panel-item.vue2.mjs";
-import { useInjectDesignContext as n } from "./context/design.mjs";
-import { default as i } from "./components/form-desgin.mjs";
-import { CreateFormDesign as s } from "./core/index.mjs";
+import { useInjectDesignContext as i } from "./context/design.mjs";
+import { default as p } from "./components/form-desgin.mjs";
+import { CreateFormDesign as x } from "./core/index.mjs";
 import "./components/index.mjs";
-import { BaseSchema as f, ExtendSchema as g, LayoutSchema as c, tempSchema as h } from "./config/index.mjs";
-import { onDesignFieldChange as S, onDesignInit as d } from "./effects/onEffects.mjs";
+import { BaseSchema as g, ExtendSchema as c, LayoutSchema as h, tempSchema as D } from "./config/index.mjs";
+import { onDesignFieldChange as d, onDesignInit as u } from "./effects/onEffects.mjs";
+import "./utils/index.mjs";
 export {
-  f as BaseSchema,
-  s as CreateFormDesign,
-  g as ExtendSchema,
-  i as FormDesign,
-  c as LayoutSchema,
-  S as onDesignFieldChange,
-  d as onDesignInit,
-  h as tempSchema,
-  n as useInjectDesignContext
+  g as BaseSchema,
+  x as CreateFormDesign,
+  c as ExtendSchema,
+  p as FormDesign,
+  h as LayoutSchema,
+  d as onDesignFieldChange,
+  u as onDesignInit,
+  D as tempSchema,
+  i as useInjectDesignContext
 };

package/dist/es/src/plugins/modules/drag-add.mjs

@@ -11,7 +11,7 @@ class g {
       const { region: t, source: n } = e, s = ["k-array-card", "k-object", "k-table", "k-grid"];
       if (s.includes(t)) {
         const { key: c } = n;
-        return !s.includes(c);
+        return !s.includes(c || "");
       }
       return !0;
     });

package/dist/es/src/utils/index.mjs

@@ -1,21 +1,23 @@
-import { getType as s, isArr as t, isBool as r, isFn as o, isHTMLElement as a, isMap as m, isNum as p, isNumberLike as n, isObj as b, isPlainObj as l, isReactElement as k, isRegExp as u, isSet as x, isStr as E, isWeakMap as M, isWeakSet as S } from "./checkers.mjs";
-import { debounce as f } from "./debounce.mjs";
+import { getType as s, isArr as o, isBool as r, isFn as t, isHTMLElement as m, isMap as a, isNum as p, isNumberLike as n, isObj as b, isPlainObj as l, isReactElement as x, isRegExp as S, isSet as c, isStr as f, isWeakMap as j, isWeakSet as k } from "./checkers.mjs";
+import { debounce as E } from "./debounce.mjs";
+import { jsonToSchema as T } from "./schema.mjs";
 export {
-  f as debounce,
+  E as debounce,
   s as getType,
-  t as isArr,
+  o as isArr,
   r as isBool,
-  o as isFn,
-  a as isHTMLElement,
-  m as isMap,
+  t as isFn,
+  m as isHTMLElement,
+  a as isMap,
   p as isNum,
   n as isNumberLike,
   b as isObj,
   l as isPlainObj,
-  k as isReactElement,
-  u as isRegExp,
-  x as isSet,
-  E as isStr,
-  M as isWeakMap,
-  S as isWeakSet
+  x as isReactElement,
+  S as isRegExp,
+  c as isSet,
+  f as isStr,
+  j as isWeakMap,
+  k as isWeakSet,
+  T as jsonToSchema
 };

package/dist/es/src/utils/schema.mjs

@@ -0,0 +1,29 @@
+import { uid as p } from "@king-one/utils";
+function l(o, t) {
+  const n = { ...o };
+  return t.forEach((e) => {
+    delete n[e];
+  }), n;
+}
+function i(o, t = {}) {
+  return o.forEach((n) => {
+    const e = l(n, ["children"]), r = n.children || [];
+    e.type === "object" && r.length ? t[e.name] = {
+      ...e,
+      properties: i(r)
+    } : e.type === "void" && r.length ? t[e.name] = {
+      ...e,
+      properties: i(r)
+    } : e.type === "array" && r.length ? t[e.name] = {
+      ...e,
+      items: e.items || {
+        type: "object",
+        id: p(),
+        properties: i(r)
+      }
+    } : t[e.name] = e;
+  }), t;
+}
+export {
+  i as jsonToSchema
+};