@vunk/form 1.1.11 → 1.1.13

package/components/form/index.js

@@ -1,32 +1,34 @@
 import { formProps, formEmits, ElForm } from 'element-plus';
 import { bindPropsFactory, onEmitsFactory } from '@vunk/core/shared/utils-vue';
 import { NOOP } from '@vunk/core/shared/utils-function';
-import { defineComponent, shallowRef, getCurrentInstance, provide, resolveComponent, openBlock, createBlock, mergeProps, toHandlers, withCtx, createVNode, renderSlot } from 'vue';
+import { defineComponent, shallowRef, getCurrentInstance, provide, computed, resolveComponent, openBlock, createBlock, mergeProps, toHandlers, withCtx, createVNode, renderSlot } from 'vue';
 import { VkfFormItemRenderer } from '@vunk/form/components/form-item-renderer';
 import { createFormBindProps, createFormOnEmits } from '@vunk/form/shared/element-plus';
 import { getValue } from '@vunk/core/shared/helper';
 import { VkfTemplatesDefault } from '@vunk/form/components/templates-default';
+import { VkfTemplatesLayout } from '@vunk/form/components/templates-layout';
+import { pickObject } from '@vunk/core/shared/utils-object';
 
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
+var __defProp$1 = Object.defineProperty;
+var __defProps$1 = Object.defineProperties;
+var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
+var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
+var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$1 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
+    if (__hasOwnProp$1.call(b, prop))
+      __defNormalProp$1(a, prop, b[prop]);
+  if (__getOwnPropSymbols$1)
+    for (var prop of __getOwnPropSymbols$1(b)) {
+      if (__propIsEnum$1.call(b, prop))
+        __defNormalProp$1(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-const props = __spreadProps(__spreadValues({}, formProps), {
+var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
+const props = __spreadProps$1(__spreadValues$1({}, formProps), {
   data: {
     type: Object,
     default: () => ({})
@@ -41,10 +43,22 @@ const props = __spreadProps(__spreadValues({}, formProps), {
   elRef: {
     type: Function,
     default: () => NOOP
+  },
+  layout: {
+    type: Boolean,
+    default: false
+  },
+  rowSource: {
+    type: Object,
+    default: () => ({})
+  },
+  colSource: {
+    type: Object,
+    default: () => ({})
   }
 });
 const createBindProps = bindPropsFactory(props);
-const emits = __spreadProps(__spreadValues({}, formEmits), {
+const emits = __spreadProps$1(__spreadValues$1({}, formEmits), {
   setData: (e) => e,
   validate: null
 });
@@ -58,6 +72,58 @@ var ctx = /*#__PURE__*/Object.freeze({
   createOnEmits: createOnEmits
 });
 
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+const getRowEmptySpan = (row) => {
+  return 24 - row.templateSlots.reduce((a, c) => {
+    if (!c.span) {
+      throw new Error("ElColSource span is required");
+    }
+    return a + c.span;
+  }, 0);
+};
+const genColItem = (formItem, options = {}) => {
+  var _a;
+  const span = (_a = formItem.span) != null ? _a : options.span;
+  if (span === void 0 || span === null) {
+    throw new Error("genColItem ElColSource span is required");
+  }
+  return __spreadProps(__spreadValues({}, options), {
+    templateType: "ElCol",
+    span,
+    templateSlots: [
+      pickObject(formItem, {
+        excludes: ["span"]
+      })
+    ]
+  });
+};
+const genRowItem = (defaultItem, options = {}) => {
+  return __spreadProps(__spreadValues({}, options), {
+    templateType: "ElRow",
+    templateSlots: defaultItem ? [
+      defaultItem
+    ] : []
+  });
+};
+
 var _export_sfc = (sfc, props) => {
   const target = sfc.__vccOpts || sfc;
   for (const [key, val] of props) {
@@ -73,7 +139,8 @@ const _sfc_main = defineComponent({
   components: {
     ElForm,
     VkfFormItemRenderer,
-    VkfTemplatesDefault
+    VkfTemplatesDefault,
+    VkfTemplatesLayout
   },
   setup(props2, { emit }) {
     const formProps = createFormBindProps(props2, ["model"]);
@@ -86,16 +153,39 @@ const _sfc_main = defineComponent({
       formRef.value = e;
       props2.elRef(e);
     };
+    const rendererSource = computed(() => {
+      if (props2.layout) {
+        return props2.formItems.reduce((a, c) => {
+          const lastRow = a[a.length - 1];
+          const itemSpan = c.span ?? props2.colSource.span;
+          if (!itemSpan) {
+            a.push(c);
+            return a;
+          }
+          const colItem = genColItem(c, props2.colSource);
+          if (!lastRow || getRowEmptySpan(lastRow) < itemSpan) {
+            a.push(genRowItem(colItem, props2.rowSource));
+          } else {
+            lastRow.templateSlots.push(colItem);
+          }
+          return a;
+        }, []);
+      }
+      return props2.formItems;
+    });
     return {
       formProps,
       formEmits,
       getValue,
-      getRef
+      getRef,
+      computed,
+      rendererSource
     };
   }
 });
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_VkfTemplatesDefault = resolveComponent("VkfTemplatesDefault");
+  const _component_VkfTemplatesLayout = resolveComponent("VkfTemplatesLayout");
   const _component_VkfFormItemRenderer = resolveComponent("VkfFormItemRenderer");
   const _component_ElForm = resolveComponent("ElForm");
   return openBlock(), createBlock(_component_ElForm, mergeProps({
@@ -107,12 +197,13 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ref: _ctx.getRef
   }), {
     default: withCtx(() => [
-      createVNode(_component_VkfFormItemRenderer, { source: _ctx.formItems }, {
+      createVNode(_component_VkfFormItemRenderer, { source: _ctx.rendererSource }, {
         default: withCtx(() => [
           createVNode(_component_VkfTemplatesDefault, {
             data: _ctx.data,
             onSetData: _cache[0] || (_cache[0] = ($event) => _ctx.$emit("setData", $event))
           }, null, 8, ["data"]),
+          createVNode(_component_VkfTemplatesLayout, { data: _ctx.data }, null, 8, ["data"]),
           renderSlot(_ctx.$slots, "rendererTemplate")
         ]),
         _: 3

package/components/form/src/ctx.d.ts

@@ -1,5 +1,6 @@
 import { PropType } from 'vue';
 import type { SetDataEvent } from '@vunk/core';
+import { ColItem, RowItem } from './types';
 export declare const props: {
     data: {
         type: PropType<Record<string, any>>;
@@ -325,6 +326,31 @@ export declare const props: {
         }> & {} & import("vue").ComponentCustomProperties & {}) => any>;
         default: () => () => void;
     };
+    /**
+     * 是否开启布局模式
+     */
+    layout: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    /**
+     * itemLayout为 true 时，
+     * 该值生效
+     * el-row 添加额外属性
+     */
+    rowSource: {
+        type: PropType<Partial<RowItem>>;
+        default: () => {};
+    };
+    /**
+     * itemLayout为 true 时，
+     * 该值生效
+     * el-col 添加额外属性
+     */
+    colSource: {
+        type: PropType<Partial<ColItem>>;
+        default: () => ColItem;
+    };
     model: ObjectConstructor;
     rules: {
         readonly type: PropType<Partial<Record<string, import("element-plus/es/utils").Arrayable<import("element-plus").FormItemRule>>>>;
@@ -357,7 +383,7 @@ export declare const props: {
     };
     disabled: BooleanConstructor;
 };
-export declare const createBindProps: <T2 extends import("@vunk/core").NormalObject, EX extends (Extract<"labelWidth", keyof T2> | Extract<"rules", keyof T2> | Extract<"inlineMessage", keyof T2> | Extract<"showMessage", keyof T2> | Extract<"size", keyof T2> | Extract<"elRef", keyof T2> | Extract<"inline", keyof T2> | Extract<"readonly", keyof T2> | Extract<"data", keyof T2> | Extract<"disabled", keyof T2> | Extract<"model", keyof T2> | Extract<"labelPosition", keyof T2> | Extract<"requireAsteriskPosition", keyof T2> | Extract<"labelSuffix", keyof T2> | Extract<"statusIcon", keyof T2> | Extract<"validateOnRuleChange", keyof T2> | Extract<"hideRequiredAsterisk", keyof T2> | Extract<"scrollToError", keyof T2> | Extract<"scrollIntoViewOptions", keyof T2> | Extract<"formItems", keyof T2>)[] | undefined>(propsArg: T2, excludes?: EX | undefined) => import("vue").ComputedRef<{ [P in EX extends (infer KE)[] ? Exclude<Extract<"labelWidth", keyof T2>, KE> | Exclude<Extract<"rules", keyof T2>, KE> | Exclude<Extract<"inlineMessage", keyof T2>, KE> | Exclude<Extract<"showMessage", keyof T2>, KE> | Exclude<Extract<"size", keyof T2>, KE> | Exclude<Extract<"elRef", keyof T2>, KE> | Exclude<Extract<"inline", keyof T2>, KE> | Exclude<Extract<"readonly", keyof T2>, KE> | Exclude<Extract<"data", keyof T2>, KE> | Exclude<Extract<"disabled", keyof T2>, KE> | Exclude<Extract<"model", keyof T2>, KE> | Exclude<Extract<"labelPosition", keyof T2>, KE> | Exclude<Extract<"requireAsteriskPosition", keyof T2>, KE> | Exclude<Extract<"labelSuffix", keyof T2>, KE> | Exclude<Extract<"statusIcon", keyof T2>, KE> | Exclude<Extract<"validateOnRuleChange", keyof T2>, KE> | Exclude<Extract<"hideRequiredAsterisk", keyof T2>, KE> | Exclude<Extract<"scrollToError", keyof T2>, KE> | Exclude<Extract<"scrollIntoViewOptions", keyof T2>, KE> | Exclude<Extract<"formItems", keyof T2>, KE> : Extract<"labelWidth", keyof T2> | Extract<"rules", keyof T2> | Extract<"inlineMessage", keyof T2> | Extract<"showMessage", keyof T2> | Extract<"size", keyof T2> | Extract<"elRef", keyof T2> | Extract<"inline", keyof T2> | Extract<"readonly", keyof T2> | Extract<"data", keyof T2> | Extract<"disabled", keyof T2> | Extract<"model", keyof T2> | Extract<"labelPosition", keyof T2> | Extract<"requireAsteriskPosition", keyof T2> | Extract<"labelSuffix", keyof T2> | Extract<"statusIcon", keyof T2> | Extract<"validateOnRuleChange", keyof T2> | Extract<"hideRequiredAsterisk", keyof T2> | Extract<"scrollToError", keyof T2> | Extract<"scrollIntoViewOptions", keyof T2> | Extract<"formItems", keyof T2>]: { [k in Extract<"labelWidth", keyof T2> | Extract<"rules", keyof T2> | Extract<"inlineMessage", keyof T2> | Extract<"showMessage", keyof T2> | Extract<"size", keyof T2> | Extract<"elRef", keyof T2> | Extract<"inline", keyof T2> | Extract<"readonly", keyof T2> | Extract<"data", keyof T2> | Extract<"disabled", keyof T2> | Extract<"model", keyof T2> | Extract<"labelPosition", keyof T2> | Extract<"requireAsteriskPosition", keyof T2> | Extract<"labelSuffix", keyof T2> | Extract<"statusIcon", keyof T2> | Extract<"validateOnRuleChange", keyof T2> | Extract<"hideRequiredAsterisk", keyof T2> | Extract<"scrollToError", keyof T2> | Extract<"scrollIntoViewOptions", keyof T2> | Extract<"formItems", keyof T2>]: T2[k]; }[P]; }>;
+export declare const createBindProps: <T2 extends import("@vunk/core").NormalObject, EX extends (Extract<"labelWidth", keyof T2> | Extract<"rules", keyof T2> | Extract<"inlineMessage", keyof T2> | Extract<"showMessage", keyof T2> | Extract<"size", keyof T2> | Extract<"elRef", keyof T2> | Extract<"inline", keyof T2> | Extract<"readonly", keyof T2> | Extract<"data", keyof T2> | Extract<"disabled", keyof T2> | Extract<"model", keyof T2> | Extract<"labelPosition", keyof T2> | Extract<"requireAsteriskPosition", keyof T2> | Extract<"labelSuffix", keyof T2> | Extract<"statusIcon", keyof T2> | Extract<"validateOnRuleChange", keyof T2> | Extract<"hideRequiredAsterisk", keyof T2> | Extract<"scrollToError", keyof T2> | Extract<"scrollIntoViewOptions", keyof T2> | Extract<"formItems", keyof T2> | Extract<"layout", keyof T2> | Extract<"rowSource", keyof T2> | Extract<"colSource", keyof T2>)[] | undefined>(propsArg: T2, excludes?: EX | undefined) => import("vue").ComputedRef<{ [P in EX extends (infer KE)[] ? Exclude<Extract<"labelWidth", keyof T2>, KE> | Exclude<Extract<"rules", keyof T2>, KE> | Exclude<Extract<"inlineMessage", keyof T2>, KE> | Exclude<Extract<"showMessage", keyof T2>, KE> | Exclude<Extract<"size", keyof T2>, KE> | Exclude<Extract<"elRef", keyof T2>, KE> | Exclude<Extract<"inline", keyof T2>, KE> | Exclude<Extract<"readonly", keyof T2>, KE> | Exclude<Extract<"data", keyof T2>, KE> | Exclude<Extract<"disabled", keyof T2>, KE> | Exclude<Extract<"model", keyof T2>, KE> | Exclude<Extract<"labelPosition", keyof T2>, KE> | Exclude<Extract<"requireAsteriskPosition", keyof T2>, KE> | Exclude<Extract<"labelSuffix", keyof T2>, KE> | Exclude<Extract<"statusIcon", keyof T2>, KE> | Exclude<Extract<"validateOnRuleChange", keyof T2>, KE> | Exclude<Extract<"hideRequiredAsterisk", keyof T2>, KE> | Exclude<Extract<"scrollToError", keyof T2>, KE> | Exclude<Extract<"scrollIntoViewOptions", keyof T2>, KE> | Exclude<Extract<"formItems", keyof T2>, KE> | Exclude<Extract<"layout", keyof T2>, KE> | Exclude<Extract<"rowSource", keyof T2>, KE> | Exclude<Extract<"colSource", keyof T2>, KE> : Extract<"labelWidth", keyof T2> | Extract<"rules", keyof T2> | Extract<"inlineMessage", keyof T2> | Extract<"showMessage", keyof T2> | Extract<"size", keyof T2> | Extract<"elRef", keyof T2> | Extract<"inline", keyof T2> | Extract<"readonly", keyof T2> | Extract<"data", keyof T2> | Extract<"disabled", keyof T2> | Extract<"model", keyof T2> | Extract<"labelPosition", keyof T2> | Extract<"requireAsteriskPosition", keyof T2> | Extract<"labelSuffix", keyof T2> | Extract<"statusIcon", keyof T2> | Extract<"validateOnRuleChange", keyof T2> | Extract<"hideRequiredAsterisk", keyof T2> | Extract<"scrollToError", keyof T2> | Extract<"scrollIntoViewOptions", keyof T2> | Extract<"formItems", keyof T2> | Extract<"layout", keyof T2> | Extract<"rowSource", keyof T2> | Extract<"colSource", keyof T2>]: { [k in Extract<"labelWidth", keyof T2> | Extract<"rules", keyof T2> | Extract<"inlineMessage", keyof T2> | Extract<"showMessage", keyof T2> | Extract<"size", keyof T2> | Extract<"elRef", keyof T2> | Extract<"inline", keyof T2> | Extract<"readonly", keyof T2> | Extract<"data", keyof T2> | Extract<"disabled", keyof T2> | Extract<"model", keyof T2> | Extract<"labelPosition", keyof T2> | Extract<"requireAsteriskPosition", keyof T2> | Extract<"labelSuffix", keyof T2> | Extract<"statusIcon", keyof T2> | Extract<"validateOnRuleChange", keyof T2> | Extract<"hideRequiredAsterisk", keyof T2> | Extract<"scrollToError", keyof T2> | Extract<"scrollIntoViewOptions", keyof T2> | Extract<"formItems", keyof T2> | Extract<"layout", keyof T2> | Extract<"rowSource", keyof T2> | Extract<"colSource", keyof T2>]: T2[k]; }[P]; }>;
 export declare const emits: {
     setData: (e: SetDataEvent) => SetDataEvent<any>;
     validate: null;

package/components/form/src/ctx.js

@@ -36,6 +36,18 @@ const props = __spreadProps(__spreadValues({}, formProps), {
   elRef: {
     type: Function,
     default: () => NOOP
+  },
+  layout: {
+    type: Boolean,
+    default: false
+  },
+  rowSource: {
+    type: Object,
+    default: () => ({})
+  },
+  colSource: {
+    type: Object,
+    default: () => ({})
   }
 });
 const createBindProps = bindPropsFactory(props);

package/components/form/src/index.vue.d.ts

@@ -1,4 +1,5 @@
 import { ElForm } from 'element-plus';
+import { RowItem } from './types';
 declare const _default: import("vue").DefineComponent<{
     data: {
         type: import("vue").PropType<Record<string, any>>;
@@ -324,6 +325,18 @@ declare const _default: import("vue").DefineComponent<{
         }> & {} & import("vue").ComponentCustomProperties & {}) => any>;
         default: () => () => void;
     };
+    layout: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    rowSource: {
+        type: import("vue").PropType<Partial<RowItem>>;
+        default: () => {};
+    };
+    colSource: {
+        type: import("vue").PropType<Partial<import("./types").ColItem>>;
+        default: () => import("./types").ColItem;
+    };
     model: ObjectConstructor;
     rules: {
         readonly type: import("vue").PropType<Partial<Record<string, import("element-plus/es/utils").Arrayable<import("element-plus").FormItemRule>>>>;
@@ -378,6 +391,8 @@ declare const _default: import("vue").DefineComponent<{
     };
     getValue: (obj: any, k: any, intoUndefined?: import("@vunk/core").IntoUndefined | undefined, safe?: boolean | undefined) => any;
     getRef: (e: InstanceType<typeof ElForm>) => void;
+    computed: typeof import("@vue/reactivity").computed;
+    rendererSource: import("vue").ComputedRef<any>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     setData: (e: import("@vunk/core").SetDataEvent<any>) => import("@vunk/core").SetDataEvent<any>;
     validate: null;
@@ -706,6 +721,18 @@ declare const _default: import("vue").DefineComponent<{
         }> & {} & import("vue").ComponentCustomProperties & {}) => any>;
         default: () => () => void;
     };
+    layout: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    rowSource: {
+        type: import("vue").PropType<Partial<RowItem>>;
+        default: () => {};
+    };
+    colSource: {
+        type: import("vue").PropType<Partial<import("./types").ColItem>>;
+        default: () => import("./types").ColItem;
+    };
     model: ObjectConstructor;
     rules: {
         readonly type: import("vue").PropType<Partial<Record<string, import("element-plus/es/utils").Arrayable<import("element-plus").FormItemRule>>>>;
@@ -1066,5 +1093,8 @@ declare const _default: import("vue").DefineComponent<{
     hideRequiredAsterisk: boolean;
     scrollToError: boolean;
     formItems: any[];
+    layout: boolean;
+    rowSource: Partial<RowItem>;
+    colSource: Partial<import("./types").ColItem>;
 }>;
 export default _default;

package/components/form/src/types.d.ts

@@ -1,2 +1,12 @@
-import { FormItemRendererSource } from '@vunk/form/shared';
-export declare type FormItem<P extends string = string> = FormItemRendererSource<P>;
+import { __VkfTemplatesDefault } from '@vunk/form/components/templates-default';
+import { __VkfTemplatesLayout } from '@vunk/form/components/templates-layout';
+export declare type FormItem<P extends string = string> = (__VkfTemplatesDefault.Source<P> | __VkfTemplatesLayout.ElRowSource<FormItem<P>> | __VkfTemplatesLayout.ElColSource<FormItem<P>> | __VkfTemplatesLayout.VkfFlexSource<FormItem<P>>) & {
+    /**
+     * 如果开启 props.itemLayout，那么
+     * span 将生效
+     * 1-24 之间的数字
+     */
+    span?: number;
+};
+export declare type ColItem = __VkfTemplatesLayout.ElColSource<FormItem>;
+export declare type RowItem = __VkfTemplatesLayout.ElRowSource<ColItem>;

package/components/form/src/utils.d.ts

@@ -0,0 +1,15 @@
+import { ColItem, FormItem, RowItem } from './types';
+import { __VkfTemplatesLayout } from '@vunk/form/components/templates-layout';
+/**
+ * 判断 Row 中有多少空位
+ * @param row
+ * @returns
+ */
+export declare const getRowEmptySpan: (row: RowItem) => number;
+/**
+ * 根据 formItem 当前的 span 包装出 elCol 的数据
+ * @param formItem
+ * @returns
+ */
+export declare const genColItem: (formItem: FormItem, options?: Partial<ColItem>) => __VkfTemplatesLayout.ElColSource<FormItem<string>>;
+export declare const genRowItem: (defaultItem: ColItem, options?: Partial<RowItem>) => RowItem;

package/components/form/src/utils.js

@@ -0,0 +1,55 @@
+import { pickObject } from '@vunk/core/shared/utils-object';
+
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+const getRowEmptySpan = (row) => {
+  return 24 - row.templateSlots.reduce((a, c) => {
+    if (!c.span) {
+      throw new Error("ElColSource span is required");
+    }
+    return a + c.span;
+  }, 0);
+};
+const genColItem = (formItem, options = {}) => {
+  var _a;
+  const span = (_a = formItem.span) != null ? _a : options.span;
+  if (span === void 0 || span === null) {
+    throw new Error("genColItem ElColSource span is required");
+  }
+  return __spreadProps(__spreadValues({}, options), {
+    templateType: "ElCol",
+    span,
+    templateSlots: [
+      pickObject(formItem, {
+        excludes: ["span"]
+      })
+    ]
+  });
+};
+const genRowItem = (defaultItem, options = {}) => {
+  return __spreadProps(__spreadValues({}, options), {
+    templateType: "ElRow",
+    templateSlots: defaultItem ? [
+      defaultItem
+    ] : []
+  });
+};
+
+export { genColItem, genRowItem, getRowEmptySpan };

package/components/geoinput/src/ctx.d.ts

@@ -213,6 +213,6 @@ export declare const emits: {
     compositionupdate: (evt: CompositionEvent) => boolean;
     compositionend: (evt: CompositionEvent) => boolean;
     layerChange: (layer: import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent) => import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent;
-    click: (e: import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent) => import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent;
+    layerClick: (e: import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent) => import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent;
     load: (e: import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent) => import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent;
 };

package/components/geoinput/src/index.vue.d.ts

@@ -303,7 +303,6 @@ declare const _default: import("vue").DefineComponent<{
         spikSave: boolean;
     }>;
     readEmits: {
-        click: (e: any) => void;
         "update:modelValue": (e: any) => void;
         input: (e: any) => void;
         change: (e: any) => void;
@@ -318,6 +317,7 @@ declare const _default: import("vue").DefineComponent<{
         compositionend: (e: any) => void;
         load: (e: any) => void;
         layerChange: (e: any) => void;
+        layerClick: (e: any) => void;
     };
     updateEmits: {
         "update:modelValue": (e: any) => void;
@@ -349,7 +349,7 @@ declare const _default: import("vue").DefineComponent<{
     compositionupdate: (evt: CompositionEvent) => boolean;
     compositionend: (evt: CompositionEvent) => boolean;
     layerChange: (layer: import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent) => import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent;
-    click: (e: import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent) => import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent;
+    layerClick: (e: import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent) => import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent;
     load: (e: import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent) => import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent;
 }, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     readonly: {
@@ -548,7 +548,6 @@ declare const _default: import("vue").DefineComponent<{
         default: () => import("geojson").FeatureCollection<import("geojson").Geometry, import("geojson").GeoJsonProperties>;
     };
 }>> & {
-    onClick?: ((e: import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent) => any) | undefined;
     onChange?: ((value: string) => any) | undefined;
     "onUpdate:modelValue"?: ((e: import("geojson").FeatureCollection<import("geojson").Geometry, import("geojson").GeoJsonProperties>) => any) | undefined;
     onInput?: ((value: string) => any) | undefined;
@@ -563,6 +562,7 @@ declare const _default: import("vue").DefineComponent<{
     onCompositionend?: ((evt: CompositionEvent) => any) | undefined;
     onLoad?: ((e: import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent) => any) | undefined;
     onLayerChange?: ((layer: import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent) => any) | undefined;
+    onLayerClick?: ((e: import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent) => any) | undefined;
     onEditUpdate?: ((e: any) => any) | undefined;
 }, {
     required: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;

package/components/geoinput-read/index.js

@@ -4,6 +4,7 @@ import { _VkfInputCtx, VkfInput } from '@vunk/form/components/input';
 import { EMPTY_FEATURE_COLLECTION } from '@vumap/core/shared/static';
 import { _VmGeojsonLayerCtx } from '@vumap/core/components/geojson-layer';
 import { bindPropsFactory, onEmitsFactory } from '@vunk/core/shared/utils-vue';
+import { pickObject } from '@vunk/core/shared/utils-object';
 import { ElButton, ElIcon, ElButtonGroup } from 'element-plus';
 import { VmGeojsonLayer, _VmGeojsonLayerCtx as _VmGeojsonLayerCtx$1, useMap, VmTdtLayers, VmMap } from '@vumap/core';
 import { fitGeojson } from '@vumap/core/shared/utils';
@@ -58,9 +59,12 @@ const props = __spreadProps(__spreadValues$1(__spreadValues$1({}, _VkfInputCtx.p
   }
 });
 const createBindProps = bindPropsFactory(props);
-const emits = __spreadProps(__spreadValues$1(__spreadValues$1({}, _VmGeojsonLayerCtx.emits), _VkfInputCtx.emits), {
+const emits = __spreadProps(__spreadValues$1(__spreadValues$1({}, pickObject(_VmGeojsonLayerCtx.emits, {
+  excludes: ["click"]
+})), _VkfInputCtx.emits), {
   "layerChange": (layer) => layer,
-  "update:modelValue": (e) => e
+  "update:modelValue": (e) => e,
+  "layerClick": (e) => e
 });
 const createOnEmits = onEmitsFactory(emits);
 
@@ -283,9 +287,11 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
     createVNode(_component_VmGeojsonLayer, mergeProps(_ctx.mapBindProps, {
       data: _ctx.modelValue,
       type: _ctx.geoType,
-      onChange: _cache[0] || (_cache[0] = $event => (_ctx.$emit('layerChange', $event))),
       paint: _ctx.paint || _ctx.paintFromEditStyles
-    }, toHandlers(_ctx.mapOnEmits)), null, 16 /* FULL_PROPS */, ["data", "type", "paint"])
+    }, toHandlers(_ctx.mapOnEmits), {
+      onChange: _cache[0] || (_cache[0] = $event => (_ctx.$emit('layerChange', $event))),
+      onClick: _cache[1] || (_cache[1] = $event => (_ctx.$emit('layerClick', $event)))
+    }), null, 16 /* FULL_PROPS */, ["data", "type", "paint"])
   ], 64 /* STABLE_FRAGMENT */))
 }
 var CoreVue = /*#__PURE__*/_export_sfc(_sfc_main$1, [['render',_sfc_render$1],['__file',"core.vue"]]);

package/components/geoinput-read/src/core.vue.d.ts

@@ -201,17 +201,17 @@ declare const _default: import("vue").DefineComponent<{
         rows: number | undefined;
     }>;
     inputOnEmits: {
-        input: (layer: import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent) => void;
-        change: (layer: import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent) => void;
-        focus: (layer: import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent) => void;
-        blur: (layer: import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent) => void;
-        clear: (layer: import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent) => void;
-        mouseleave: (layer: import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent) => void;
-        mouseenter: (layer: import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent) => void;
-        keydown: (layer: import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent) => void;
-        compositionstart: (layer: import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent) => void;
-        compositionupdate: (layer: import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent) => void;
-        compositionend: (layer: import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent) => void;
+        input: (e: import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent) => void;
+        change: (e: import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent) => void;
+        focus: (e: import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent) => void;
+        blur: (e: import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent) => void;
+        clear: (e: import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent) => void;
+        mouseleave: (e: import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent) => void;
+        mouseenter: (e: import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent) => void;
+        keydown: (e: import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent) => void;
+        compositionstart: (e: import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent) => void;
+        compositionupdate: (e: import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent) => void;
+        compositionend: (e: import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent) => void;
     };
     mapBindProps: import("vue").ComputedRef<{
         id: string;
@@ -221,8 +221,8 @@ declare const _default: import("vue").DefineComponent<{
         before: string | undefined;
     }>;
     mapOnEmits: {
-        click: (layer: import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent) => void;
-        load: (layer: import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent) => void;
+        click: (e: import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent) => void;
+        load: (e: import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent) => void;
     };
     append: () => JSX.Element;
     geoType: import("vue").ComputedRef<any>;
@@ -230,6 +230,7 @@ declare const _default: import("vue").DefineComponent<{
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     layerChange: (layer: import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent) => import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent;
     'update:modelValue': (e: import("geojson").FeatureCollection<import("geojson").Geometry, import("geojson").GeoJsonProperties>) => import("geojson").FeatureCollection<import("geojson").Geometry, import("geojson").GeoJsonProperties>;
+    layerClick: (e: import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent) => import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent;
     input: (value: string) => boolean;
     change: (value: string) => boolean;
     focus: (evt: FocusEvent) => boolean;
@@ -241,7 +242,6 @@ declare const _default: import("vue").DefineComponent<{
     compositionstart: (evt: CompositionEvent) => boolean;
     compositionupdate: (evt: CompositionEvent) => boolean;
     compositionend: (evt: CompositionEvent) => boolean;
-    click: (e: import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent) => import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent;
     load: (e: import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent) => import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent;
 }, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     modelValue: {
@@ -407,7 +407,6 @@ declare const _default: import("vue").DefineComponent<{
     validateEvent: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     inputStyle: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => import("vue").StyleValue & {}) | (() => import("vue").StyleValue) | ((new (...args: any[]) => import("vue").StyleValue & {}) | (() => import("vue").StyleValue))[], unknown, unknown, () => import("element-plus/es/utils").Mutable<{}>, boolean>;
 }>> & {
-    onClick?: ((e: import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent) => any) | undefined;
     onChange?: ((value: string) => any) | undefined;
     "onUpdate:modelValue"?: ((e: import("geojson").FeatureCollection<import("geojson").Geometry, import("geojson").GeoJsonProperties>) => any) | undefined;
     onInput?: ((value: string) => any) | undefined;
@@ -422,6 +421,7 @@ declare const _default: import("vue").DefineComponent<{
     onCompositionend?: ((evt: CompositionEvent) => any) | undefined;
     onLoad?: ((e: import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent) => any) | undefined;
     onLayerChange?: ((layer: import("@vumap/core/components/geojson-add-layer/src/types").LoadEvent) => any) | undefined;
+    onLayerClick?: ((e: import("@vumap/core/components/geojson-layer-set/src/types").ClickEvent) => any) | undefined;
 }, {
     required: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     type: string;

package/components/geoinput-read/src/ctx.d.ts

@@ -172,6 +172,7 @@ export declare const createBindProps: <T2 extends import("@vunk/core").NormalObj
 export declare const emits: {
     layerChange: (layer: __VmGeojsonLayer.LoadEvent) => __VmGeojsonLayer.LoadEvent;
     'update:modelValue': (e: FeatureCollection) => FeatureCollection<import("geojson").Geometry, import("geojson").GeoJsonProperties>;
+    layerClick: (e: __VmGeojsonLayer.ClickEvent) => __VmGeojsonLayer.ClickEvent;
     input: (value: string) => boolean;
     change: (value: string) => boolean;
     focus: (evt: FocusEvent) => boolean;
@@ -183,12 +184,12 @@ export declare const emits: {
     compositionstart: (evt: CompositionEvent) => boolean;
     compositionupdate: (evt: CompositionEvent) => boolean;
     compositionend: (evt: CompositionEvent) => boolean;
-    click: (e: __VmGeojsonLayer.ClickEvent) => __VmGeojsonLayer.ClickEvent;
     load: (e: __VmGeojsonLayer.LoadEvent) => __VmGeojsonLayer.LoadEvent;
 };
-export declare const createOnEmits: <T2 extends import("@vunk/core").AnyFunc, EX extends ("click" | "update:modelValue" | "input" | "change" | "focus" | "blur" | "clear" | "mouseleave" | "mouseenter" | "keydown" | "compositionstart" | "compositionupdate" | "compositionend" | "load" | "layerChange")[] | undefined>(emit: T2, excludes?: EX | undefined) => { [P in EX extends (infer KE)[] ? Exclude<"click", KE> | Exclude<"update:modelValue", KE> | Exclude<"input", KE> | Exclude<"change", KE> | Exclude<"focus", KE> | Exclude<"blur", KE> | Exclude<"clear", KE> | Exclude<"mouseleave", KE> | Exclude<"mouseenter", KE> | Exclude<"keydown", KE> | Exclude<"compositionstart", KE> | Exclude<"compositionupdate", KE> | Exclude<"compositionend", KE> | Exclude<"load", KE> | Exclude<"layerChange", KE> : "click" | "update:modelValue" | "input" | "change" | "focus" | "blur" | "clear" | "mouseleave" | "mouseenter" | "keydown" | "compositionstart" | "compositionupdate" | "compositionend" | "load" | "layerChange"]: {
+export declare const createOnEmits: <T2 extends import("@vunk/core").AnyFunc, EX extends ("update:modelValue" | "input" | "change" | "focus" | "blur" | "clear" | "mouseleave" | "mouseenter" | "keydown" | "compositionstart" | "compositionupdate" | "compositionend" | "load" | "layerChange" | "layerClick")[] | undefined>(emit: T2, excludes?: EX | undefined) => { [P in EX extends (infer KE)[] ? Exclude<"update:modelValue", KE> | Exclude<"input", KE> | Exclude<"change", KE> | Exclude<"focus", KE> | Exclude<"blur", KE> | Exclude<"clear", KE> | Exclude<"mouseleave", KE> | Exclude<"mouseenter", KE> | Exclude<"keydown", KE> | Exclude<"compositionstart", KE> | Exclude<"compositionupdate", KE> | Exclude<"compositionend", KE> | Exclude<"load", KE> | Exclude<"layerChange", KE> | Exclude<"layerClick", KE> : "update:modelValue" | "input" | "change" | "focus" | "blur" | "clear" | "mouseleave" | "mouseenter" | "keydown" | "compositionstart" | "compositionupdate" | "compositionend" | "load" | "layerChange" | "layerClick"]: {
     layerChange: (...e: import("@vunk/core").RestParameters<T2>) => void;
     'update:modelValue': (...e: import("@vunk/core").RestParameters<T2>) => void;
+    layerClick: (...e: import("@vunk/core").RestParameters<T2>) => void;
     input: (...e: import("@vunk/core").RestParameters<T2>) => void;
     change: (...e: import("@vunk/core").RestParameters<T2>) => void;
     focus: (...e: import("@vunk/core").RestParameters<T2>) => void;
@@ -200,6 +201,5 @@ export declare const createOnEmits: <T2 extends import("@vunk/core").AnyFunc, EX
     compositionstart: (...e: import("@vunk/core").RestParameters<T2>) => void;
     compositionupdate: (...e: import("@vunk/core").RestParameters<T2>) => void;
     compositionend: (...e: import("@vunk/core").RestParameters<T2>) => void;
-    click: (...e: import("@vunk/core").RestParameters<T2>) => void;
     load: (...e: import("@vunk/core").RestParameters<T2>) => void;
 }[P]; };