hy-dispatch-ui-v3 0.2.65 → 0.2.66

package/es/components/hyForm/cpns/formItem.vue.mjs

@@ -1,8 +1,9 @@
-import { useTemplateRef, computed, unref, openBlock, createElementBlock, normalizeClass, normalizeStyle, createBlock, withCtx, createCommentVNode, createElementVNode, renderSlot, toDisplayString, createVNode, Fragment, mergeProps } from 'vue';
-import { ElFormItem, ElSelect, ElRadioGroup, ElCheckboxGroup, ElSwitch, ElInputNumber, ElCascader } from 'element-plus';
+import { inject, useTemplateRef, computed, ref, reactive, toRefs, onMounted, onBeforeUnmount, unref, openBlock, createElementBlock, normalizeClass, normalizeStyle, createBlock, createSlots, withCtx, createElementVNode, renderSlot, toDisplayString, createCommentVNode, createVNode, Fragment, mergeProps } from 'vue';
+import { ElFormItem, ElSelect, ElIcon, ElSelectV2, ElRadioGroup, ElCheckboxGroup, ElSwitch, ElInputNumber, ElCascader } from 'element-plus';
+import { Loading } from '@element-plus/icons-vue';
 import '../../../utils/index.mjs';
 import '../../index.mjs';
-import { isRequired, columnVisibleHandler, columnItemStyle, columnShowHandler, columnHelpHandler, isReadonly, renderText, isDisabled, optionsHandler } from '../js/index.mjs';
+import { formContextKey, isRequired, optionsHandler, columnVisibleHandler, columnItemStyle, columnShowHandler, columnHelpHandler, isReadonly, renderText, isDisabled } from '../js/index.mjs';
 import '../../../hooks/index.mjs';
 import { useLocale } from '../../../hooks/useLocale.mjs';
 import { isArray } from '../../../utils/is.mjs';
@@ -60,7 +61,9 @@ const _sfc_main = {
   setup(__props) {
     const { t } = useLocale();
     const props = __props;
+    const formContext = inject(formContextKey);
     const formItemRef = useTemplateRef("formItemRef");
+    const orgCascaderRef = useTemplateRef("orgCascaderRef");
     const columnProp = computed(() => {
       let field = isArray(props.column.field) ? props.column.field[0] : props.column.field;
       if (props.parentProp) {
@@ -68,6 +71,10 @@ const _sfc_main = {
       }
       return field;
     });
+    const propString = computed(() => {
+      if (!columnProp.value) return "";
+      return isArray(columnProp.value) ? columnProp.value.join(".") : columnProp.value;
+    });
     const bindValue = computed({
       get() {
         const prop = isArray(props.column.field) ? props.column.field[0] : props.column.field;
@@ -88,6 +95,12 @@ const _sfc_main = {
         setValueByProp(props.model, prop, val);
       }
     });
+    const columnConfig = computed(() => {
+      return {
+        ...props.column,
+        attrs: columnAttrs.value
+      };
+    });
     const columnAttrs = computed(() => {
       return {
         ...props.column.attrs,
@@ -95,6 +108,37 @@ const _sfc_main = {
         placeholder: columnPlaceholderHandler(props.column, props.model)
       };
     });
+    const optionsLoading = ref(false);
+    const optionsError = ref("");
+    async function obtainOptions() {
+      if (props.column.optionsFn) {
+        if (!props.column.optionsFn || optionsLoading.value) return;
+        optionsLoading.value = true;
+        optionsError.value = "";
+        props.column.attrs.options = [];
+        try {
+          props.column.attrs.options = await props.column.optionsFn(
+            props.column,
+            props.model
+          );
+          optionsError.value = "";
+        } catch (err) {
+          optionsError.value = "error";
+          console.error(err);
+        }
+      } else if (props.column.type === "org-cascader") {
+        if (orgCascaderRef.value) {
+          optionsLoading.value = true;
+          optionsError.value = "";
+          try {
+            await orgCascaderRef.value.getData();
+          } catch {
+            optionsError.value = "error";
+          }
+        }
+      }
+      optionsLoading.value = false;
+    }
     function getColumnRuleHandler(column, model) {
       if (!isRequired(props, column) && formItemRef.value) {
         formItemRef.value.clearValidate();
@@ -104,8 +148,29 @@ const _sfc_main = {
     function onChangeHandler() {
       const { onChange } = props.column;
       if (!onChange) return;
-      onChange(props.column, props.model);
+      onChange(props.column, props.model, props.index);
     }
+    const context = reactive({
+      ...toRefs(props),
+      columnProp,
+      propString,
+      columnConfig,
+      columnAttrs,
+      obtainOptions,
+      optionsLoading,
+      optionsError,
+      options: computed(() => {
+        return optionsHandler(props, props.column);
+      })
+    });
+    onMounted(() => {
+      if (propString.value) {
+        formContext?.addField(context);
+      }
+    });
+    onBeforeUnmount(() => {
+      formContext?.removeField(context);
+    });
     return (_ctx, _cache) => {
       return !unref(columnVisibleHandler)(props, __props.column) ? (openBlock(), createElementBlock("div", {
         key: 0,
@@ -122,14 +187,14 @@ const _sfc_main = {
         id: __props.column.id,
         prop: columnProp.value,
         rules: getColumnRuleHandler(__props.column, props.model),
-        style: normalizeStyle(unref(columnItemStyle)(props, __props.column))
-      }, {
+        style: normalizeStyle(unref(columnItemStyle)(props, __props.column)),
+        error: optionsError.value
+      }, createSlots({
         default: withCtx(() => [
-          createCommentVNode(" \u8868\u5355\u9879label "),
           createElementVNode("div", { class: "w-full flex justify-between text-main" }, [
             createElementVNode("div", { class: "flex items-center" }, [
               renderSlot(_ctx.$slots, __props.column.labelSlot, {
-                column: __props.column,
+                column: columnConfig.value,
                 model: __props.model,
                 required: unref(isRequired)(props, __props.column)
               }, () => [
@@ -158,7 +223,11 @@ const _sfc_main = {
                     1
                     /* TEXT */
                   )) : createCommentVNode("v-if", true),
-                  renderSlot(_ctx.$slots, __props.column.tooltipContentSlot)
+                  renderSlot(_ctx.$slots, __props.column.tooltipContentSlot, {
+                    column: columnConfig.value,
+                    model: __props.model,
+                    required: unref(isRequired)(props, __props.column)
+                  })
                 ]),
                 default: withCtx(() => [
                   createElementVNode("span", { class: "text-xs text-theme ml-2" }, [
@@ -184,13 +253,12 @@ const _sfc_main = {
               class: "ml-2 flex items-center"
             }, [
               renderSlot(_ctx.$slots, __props.column.rightSlot, {
-                column: __props.column,
+                column: columnConfig.value,
                 model: __props.model,
                 required: unref(isRequired)(props, __props.column)
               })
             ])) : createCommentVNode("v-if", true)
           ]),
-          createCommentVNode(" \u5185\u5BB9\u4EC5\u67E5\u770B "),
           unref(isReadonly)(props, __props.column) || !__props.column.type && !__props.column.slot ? (openBlock(), createElementBlock(
             "div",
             {
@@ -226,9 +294,10 @@ const _sfc_main = {
             Fragment,
             { key: 1 },
             [
+              createCommentVNode(" \u8868\u5355\u9879 "),
               createCommentVNode(" \u81EA\u5B9A\u4E49\u5177\u540D\u63D2\u69FD "),
               __props.column.slot && _ctx.$slots[__props.column.slot] ? renderSlot(_ctx.$slots, __props.column.slot, {
-                column: __props.column,
+                column: columnConfig.value,
                 model: __props.model,
                 required: unref(isRequired)(props, __props.column)
               }, void 0, void 0, 0) : __props.column.type === "input" ? (openBlock(), createElementBlock(
@@ -258,13 +327,75 @@ const _sfc_main = {
                     disabled: unref(isDisabled)(props, __props.column),
                     options: unref(optionsHandler)(props, __props.column),
                     onChange: onChangeHandler
-                  }), null, 16, ["modelValue", "onUpdate:modelValue", "disabled", "options"])
+                  }), createSlots({
+                    _: 2
+                    /* DYNAMIC */
+                  }, [
+                    optionsLoading.value ? {
+                      name: "empty",
+                      fn: withCtx(() => [
+                        createElementVNode("div", { class: "w-full flex items-center justify-center py-2 gap-1.5 text-main text-xs whitespace-nowrap" }, [
+                          createVNode(unref(ElIcon), {
+                            size: "16",
+                            class: "is-loading text-theme"
+                          }, {
+                            default: withCtx(() => [
+                              createVNode(unref(Loading))
+                            ]),
+                            _: 1
+                            /* STABLE */
+                          }),
+                          createElementVNode("span", null, "\u6570\u636E\u6B63\u5728\u52A0\u8F7D\u4E2D")
+                        ])
+                      ]),
+                      key: "0"
+                    } : void 0
+                  ]), 1040, ["modelValue", "onUpdate:modelValue", "disabled", "options"])
                 ],
                 2112
                 /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
-              )) : __props.column.type === "date-picker" ? (openBlock(), createElementBlock(
+              )) : __props.column.type === "select-v2" ? (openBlock(), createElementBlock(
                 Fragment,
                 { key: 3 },
+                [
+                  createCommentVNode(" \u865A\u62DF\u5316\u9009\u62E9\u6846 "),
+                  createVNode(unref(ElSelectV2), mergeProps({
+                    modelValue: bindValue.value,
+                    "onUpdate:modelValue": ($event) => bindValue.value = $event
+                  }, columnAttrs.value, {
+                    disabled: unref(isDisabled)(props, __props.column),
+                    options: unref(optionsHandler)(props, __props.column),
+                    onChange: onChangeHandler
+                  }), createSlots({
+                    _: 2
+                    /* DYNAMIC */
+                  }, [
+                    optionsLoading.value ? {
+                      name: "empty",
+                      fn: withCtx(() => [
+                        createElementVNode("div", { class: "w-full flex items-center justify-center py-2 gap-1.5 text-main text-xs whitespace-nowrap" }, [
+                          createVNode(unref(ElIcon), {
+                            size: "16",
+                            class: "is-loading text-theme"
+                          }, {
+                            default: withCtx(() => [
+                              createVNode(unref(Loading))
+                            ]),
+                            _: 1
+                            /* STABLE */
+                          }),
+                          createElementVNode("span", null, "\u6570\u636E\u6B63\u5728\u52A0\u8F7D\u4E2D")
+                        ])
+                      ]),
+                      key: "0"
+                    } : void 0
+                  ]), 1040, ["modelValue", "onUpdate:modelValue", "disabled", "options"])
+                ],
+                2112
+                /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
+              )) : __props.column.type === "date-picker" ? (openBlock(), createElementBlock(
+                Fragment,
+                { key: 4 },
                 [
                   createCommentVNode(" \u65E5\u671F\u9009\u62E9\u6846 "),
                   ["datetimerange", "daterange", "monthrange", "yearrange"].includes(
@@ -297,7 +428,7 @@ const _sfc_main = {
                 /* STABLE_FRAGMENT */
               )) : __props.column.type === "time-picker" ? (openBlock(), createElementBlock(
                 Fragment,
-                { key: 4 },
+                { key: 5 },
                 [
                   createCommentVNode(" \u65F6\u95F4\u9009\u62E9\u6846 "),
                   columnAttrs.value.isRange ? (openBlock(), createBlock(unref(HyTimePicker), mergeProps({
@@ -328,7 +459,7 @@ const _sfc_main = {
                 /* STABLE_FRAGMENT */
               )) : __props.column.type === "radio" ? (openBlock(), createElementBlock(
                 Fragment,
-                { key: 5 },
+                { key: 6 },
                 [
                   createCommentVNode(" \u5355\u9009 "),
                   createVNode(unref(ElRadioGroup), mergeProps({
@@ -344,7 +475,7 @@ const _sfc_main = {
                 /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
               )) : __props.column.type === "radio-group" ? (openBlock(), createElementBlock(
                 Fragment,
-                { key: 6 },
+                { key: 7 },
                 [
                   createCommentVNode(" \u5355\u9009\u6309\u94AE "),
                   createVNode(unref(HyRadioGroup), mergeProps({
@@ -361,7 +492,7 @@ const _sfc_main = {
                 /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
               )) : __props.column.type === "checkbox" ? (openBlock(), createElementBlock(
                 Fragment,
-                { key: 7 },
+                { key: 8 },
                 [
                   createCommentVNode(" \u591A\u9009 "),
                   createVNode(unref(ElCheckboxGroup), mergeProps({
@@ -377,7 +508,7 @@ const _sfc_main = {
                 /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
               )) : __props.column.type === "switch" ? (openBlock(), createElementBlock(
                 Fragment,
-                { key: 8 },
+                { key: 9 },
                 [
                   createCommentVNode(" \u5F00\u5173 "),
                   createVNode(unref(ElSwitch), mergeProps({
@@ -395,7 +526,7 @@ const _sfc_main = {
                 /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
               )) : __props.column.type === "input-number" ? (openBlock(), createElementBlock(
                 Fragment,
-                { key: 9 },
+                { key: 10 },
                 [
                   createCommentVNode(" \u6570\u5B57\u8F93\u5165\u6846 "),
                   createVNode(unref(ElInputNumber), mergeProps({
@@ -410,10 +541,12 @@ const _sfc_main = {
                 /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
               )) : __props.column.type === "org-cascader" ? (openBlock(), createElementBlock(
                 Fragment,
-                { key: 10 },
+                { key: 11 },
                 [
                   createCommentVNode(" \u90E8\u95E8\u7EA7\u8054\u9009\u62E9\u6846 "),
                   createVNode(unref(HyOrgCascader), mergeProps({
+                    ref_key: "orgCascaderRef",
+                    ref: orgCascaderRef,
                     modelValue: bindValue.value,
                     "onUpdate:modelValue": ($event) => bindValue.value = $event,
                     class: "w-full"
@@ -426,17 +559,41 @@ const _sfc_main = {
                 /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
               )) : __props.column.type === "cascader" ? (openBlock(), createElementBlock(
                 Fragment,
-                { key: 11 },
+                { key: 12 },
                 [
                   createCommentVNode(" \u7EA7\u8054\u9009\u62E9\u6846 "),
                   createVNode(unref(ElCascader), mergeProps({
                     modelValue: bindValue.value,
                     "onUpdate:modelValue": ($event) => bindValue.value = $event
                   }, columnAttrs.value, {
+                    class: "w-full",
                     disabled: unref(isDisabled)(props, __props.column),
                     options: unref(optionsHandler)(props, __props.column),
                     onChange: onChangeHandler
-                  }), null, 16, ["modelValue", "onUpdate:modelValue", "disabled", "options"])
+                  }), createSlots({
+                    _: 2
+                    /* DYNAMIC */
+                  }, [
+                    optionsLoading.value ? {
+                      name: "empty",
+                      fn: withCtx(() => [
+                        createElementVNode("div", { class: "w-full flex items-center justify-center py-2 gap-1.5 text-main text-xs whitespace-nowrap" }, [
+                          createVNode(unref(ElIcon), {
+                            size: "16",
+                            class: "is-loading text-theme"
+                          }, {
+                            default: withCtx(() => [
+                              createVNode(unref(Loading))
+                            ]),
+                            _: 1
+                            /* STABLE */
+                          }),
+                          createElementVNode("span", null, "\u6570\u636E\u6B63\u5728\u52A0\u8F7D\u4E2D")
+                        ])
+                      ]),
+                      key: "0"
+                    } : void 0
+                  ]), 1040, ["modelValue", "onUpdate:modelValue", "disabled", "options"])
                 ],
                 2112
                 /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
@@ -446,9 +603,24 @@ const _sfc_main = {
             /* STABLE_FRAGMENT */
           ))
         ]),
-        _: 3
-        /* FORWARDED */
-      }, 8, ["id", "prop", "rules", "style"])) : createCommentVNode("v-if", true);
+        _: 2
+        /* DYNAMIC */
+      }, [
+        optionsError.value ? {
+          name: "error",
+          fn: withCtx(() => [
+            createElementVNode("div", { class: "hy-el-form-item__error" }, [
+              createElementVNode("span", null, "\u6570\u636E\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7"),
+              createElementVNode("span", {
+                class: "text-theme cursor-pointer",
+                onClick: obtainOptions
+              }, "[\u91CD\u65B0\u52A0\u8F7D]"),
+              createElementVNode("span", null, "\u6216\u8054\u7CFB\u7BA1\u7406\u5458")
+            ])
+          ]),
+          key: "0"
+        } : void 0
+      ]), 1032, ["id", "prop", "rules", "style", "error"])) : createCommentVNode("v-if", true);
     };
   }
 };

package/es/components/hyForm/cpns/locationSelect.vue.mjs

@@ -232,6 +232,12 @@ const _sfc_main = {
         map.setView({ lat, lng }, mapConfig.maxZoom || 18);
       }
     }
+    function clearMarker() {
+      if (marker) {
+        marker.remove();
+        marker = null;
+      }
+    }
     function setMapSize() {
       emits("setMapSize");
       setTimeout(() => {
@@ -249,7 +255,8 @@ const _sfc_main = {
       hyMap = null;
     });
     __expose({
-      setMarker
+      setMarker,
+      clearMarker
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", { class: "w-full h-full flex flex-col" }, [

package/es/components/hyForm/form.vue.mjs

@@ -1,13 +1,12 @@
-import { defineComponent, useTemplateRef, computed, ref, nextTick, unref, openBlock, createBlock, mergeProps, withCtx, createElementVNode, normalizeStyle, createCommentVNode, createElementBlock, Fragment, renderList, normalizeClass, toDisplayString, createVNode, createSlots, renderSlot } from 'vue';
+import { defineComponent, useTemplateRef, computed, ref, reactive, unref, provide, toRefs, onMounted, nextTick, openBlock, createBlock, mergeProps, withCtx, createElementVNode, normalizeStyle, createCommentVNode, createElementBlock, Fragment, renderList, normalizeClass, toDisplayString, createVNode, createSlots, renderSlot } from 'vue';
 import { ElForm, ElDivider } from 'element-plus';
-import '@element-plus/icons-vue';
 import '../../hooks/index.mjs';
 import '../../utils/index.mjs';
 import _sfc_main$4 from './cpns/formItem.vue.mjs';
 import _sfc_main$1 from './cpns/extraItem.vue.mjs';
 import _sfc_main$2 from './cpns/arrayItem.vue.mjs';
 import _sfc_main$3 from './cpns/locationSelect.vue.mjs';
-import { columnShowHandler, columnItemStyle } from './js/index.mjs';
+import { formContextKey, columnShowHandler, columnItemStyle } from './js/index.mjs';
 import { resetAppFormValue } from './js/useAppForm.mjs';
 import { useLocale } from '../../hooks/useLocale.mjs';
 import { isArray, isNumber } from '../../utils/is.mjs';
@@ -55,8 +54,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
   },
   emits: ["on-allMapSelect", "complete"],
   setup(__props, { expose: __expose, emit: __emit }) {
-    const emit = __emit;
     const props = __props;
+    const emits = __emit;
     const { t } = useLocale();
     const formTemplateRef = useTemplateRef("formTemplateRef");
     const formColumnMap = computed(() => {
@@ -79,52 +78,108 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     const allMapSelect = ref(false);
     function setMapSize() {
       allMapSelect.value = !allMapSelect.value;
-      emit("on-allMapSelect", allMapSelect.value);
+      emits("on-allMapSelect", allMapSelect.value);
     }
     function complete() {
-      emit("complete");
+      emits("complete");
     }
+    const fields = reactive([]);
+    function addField(field) {
+      fields.push(field);
+    }
+    const removeField = (field) => {
+      if (unref(field.columnAttrs)) {
+        fields.splice(fields.indexOf(field), 1);
+      }
+    };
+    function filterFields(fields2 = [], keys = []) {
+      const filterKeys = keys.map((prop) => isArray(prop) ? prop.join(".") : prop);
+      return filterKeys.length ? fields2.filter(
+        (field) => field.propString && filterKeys.includes(field.propString)
+      ) : fields2;
+    }
+    async function obtainOptionsFields(keys) {
+      const filteredFields = filterFields(fields, keys);
+      await Promise.allSettled(filteredFields.map((field) => field.obtainOptions()));
+    }
+    async function getOptions() {
+      await obtainOptionsFields();
+    }
+    async function getOptionsFields(keys) {
+      await obtainOptionsFields(keys);
+    }
+    async function getOptionsError() {
+      const filteredFields = fields.filter(
+        (field) => field.propString && field.optionsError
+      );
+      await Promise.allSettled(filteredFields.map((field) => field.obtainOptions()));
+    }
+    provide(
+      formContextKey,
+      reactive({
+        ...toRefs(props),
+        emits,
+        addField,
+        removeField
+      })
+    );
+    onMounted(() => {
+      getOptions();
+    });
     __expose({
       validate: async (callback) => {
         await nextTick();
         return unref(formTemplateRef).validate(callback);
       },
-      validateField: async (fields) => {
+      validateField: async (fields2) => {
         await nextTick();
-        return unref(formTemplateRef).validateField(fields);
+        return unref(formTemplateRef).validateField(fields2);
       },
-      resetFields: async (fields) => {
+      resetFields: async (fields2) => {
         let columns = props.columns || [];
-        if (fields && fields?.length) {
-          columns = fields.map((key) => formColumnMap.value.get(key)).filter(Boolean);
+        if (fields2 && fields2?.length) {
+          columns = fields2.map((key) => formColumnMap.value.get(key)).filter(Boolean);
         }
         resetAppFormValue(columns, props.model);
-        unref(formTemplateRef).clearValidate(fields);
+        unref(formTemplateRef).clearValidate(fields2);
       },
-      scrollToField: async (fields) => {
+      scrollToField: async (fields2) => {
         await nextTick();
-        unref(formTemplateRef).scrollToField(fields);
+        unref(formTemplateRef).scrollToField(fields2);
       },
-      clearValidate: async (fields) => {
+      clearValidate: async (fields2) => {
         await nextTick();
-        unref(formTemplateRef).clearValidate(fields);
+        unref(formTemplateRef).clearValidate(fields2);
       },
       fields: computed(() => {
         return unref(formTemplateRef)?.fields || [];
       }),
-      getField: async (fields) => {
+      getField: async (fields2) => {
         await nextTick();
-        return unref(formTemplateRef).getField(fields);
+        return unref(formTemplateRef).getField(fields2);
       },
       setMarker: (latlng) => {
         if (locationSelectRef.value) {
           isArray(locationSelectRef.value) ? locationSelectRef.value.map((item) => item.setMarker(latlng)) : locationSelectRef.value.setMarker(latlng);
         }
-      }
+      },
+      clearMarker: () => {
+        if (locationSelectRef.value) {
+          isArray(locationSelectRef.value) ? locationSelectRef.value.map((item) => item.clearMarker()) : locationSelectRef.value.clearMarker();
+        }
+      },
       // setInitialValue: async (value) => {
       //   await nextTick()
       //   unref(formTemplateRef).setInitialValue(value)
       // }
+      getOptions,
+      getOptionsFields,
+      getOptionsError,
+      getOptionsByField: (field) => {
+        const [target] = filterFields(fields, [field]);
+        if (!target) return null;
+        return target.options;
+      }
     });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(ElForm), mergeProps({

package/es/components/hyForm/js/index.mjs

@@ -6,6 +6,7 @@ import { isNumber, isBoolean, isFunction, isString, isArray, isObject } from '..
 import { columnRuleHandler, getValueByProp } from '../../../utils/form.mjs';
 import { useLocale } from '../../../hooks/useLocale.mjs';
 
+const formContextKey = /* @__PURE__ */ Symbol("formContextKey");
 function columnItemStyle(props, column) {
   const style = {};
   let span = funRunHandler(column.span, column, props.model);
@@ -119,4 +120,4 @@ function optionsHandler(props, column) {
   return [];
 }
 
-export { columnHelpHandler, columnItemStyle, columnShowHandler, columnVisibleHandler, isDisabled, isReadonly, isRequired, optionsHandler, renderAddLabel, renderArrayItemLabel, renderText };
+export { columnHelpHandler, columnItemStyle, columnShowHandler, columnVisibleHandler, formContextKey, isDisabled, isReadonly, isRequired, optionsHandler, renderAddLabel, renderArrayItemLabel, renderText };

package/es/components/hyForm/js/useAppForm.mjs

@@ -27,7 +27,7 @@ function appFormItemHandler(column = {}) {
         ...attrs
       }
     };
-  } else if (/^(radio|radio-group|checkbox|select)$/.test(column.type)) {
+  } else if (/^(radio|radio-group|checkbox|select|select-v2)$/.test(column.type)) {
     return {
       ...column,
       attrs: {
@@ -41,7 +41,7 @@ function appFormItemHandler(column = {}) {
         }
       }
     };
-  } else if (/^(extra)$/.test(column.type) || /^(location-select)$/.test(column.type)) {
+  } else if (/^(extra|location-select)$/.test(column.type)) {
     return {
       ...column,
       children: (column.children || []).map((item) => appFormItemHandler(item))

package/es/components/hyIcon/style/icon.scss

@@ -6,6 +6,7 @@
   overflow: hidden;
   fill: currentColor;
   outline: none;
+  flex-shrink: 0;
 }
 .hy-button {
   .hy-icon {

package/es/components/hyNoPermissions/noPermissions.vue.mjs

@@ -26,7 +26,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       return openBlock(), createElementBlock("div", { class: "w-full h-full bg-background-2 text-auxiliary text-base flex flex-col items-center justify-center" }, [
         createVNode(unref(HyIcon), {
           "svg-name": __props.svgName,
-          "class-name": "!w-[46px] !h-[46px]"
+          "class-name": "!w-[56px] !h-[56px]"
         }, null, 8, ["svg-name"]),
         createElementVNode("div", { class: "text-center mt-[12px]" }, [
           createElementVNode(

package/es/components/hyNoPermissionsMap/noPermissionsMap.vue.mjs

@@ -26,7 +26,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       return openBlock(), createElementBlock("div", { class: "w-full h-full bg-background-2 text-auxiliary text-base flex flex-col items-center justify-center" }, [
         createVNode(unref(HyIcon), {
           "svg-name": __props.svgName,
-          "class-name": "!w-[46px] !h-[46px]"
+          "class-name": "!w-[56px] !h-[56px]"
         }, null, 8, ["svg-name"]),
         createElementVNode("div", { class: "text-center mt-[12px]" }, [
           createElementVNode(