hy-dispatch-ui-v3 0.2.65 → 0.2.67

package/lib/components/hyForm/cpns/formItem.vue.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var vue = require('vue');
 var elementPlus = require('element-plus');
+var iconsVue = require('@element-plus/icons-vue');
 require('../../../utils/index.js');
 require('../../index.js');
 var index = require('../js/index.js');
@@ -64,7 +65,18 @@ const _sfc_main = {
   setup(__props) {
     const { t } = useLocale.useLocale();
     const props = __props;
+    const formContext = vue.inject(index.formContextKey);
     const formItemRef = vue.useTemplateRef("formItemRef");
+    const orgCascaderRef = vue.useTemplateRef("orgCascaderRef");
+    const showMessage = vue.computed(() => {
+      if (columnConfig.value.optionsError) {
+        return true;
+      }
+      if (is.isBoolean(columnConfig.value.showMessage)) {
+        return columnConfig.value.showMessage;
+      }
+      return formContext.showMessage;
+    });
     const columnProp = vue.computed(() => {
       let field = is.isArray(props.column.field) ? props.column.field[0] : props.column.field;
       if (props.parentProp) {
@@ -72,6 +84,10 @@ const _sfc_main = {
       }
       return field;
     });
+    const propString = vue.computed(() => {
+      if (!columnProp.value) return "";
+      return is.isArray(columnProp.value) ? columnProp.value.join(".") : columnProp.value;
+    });
     const bindValue = vue.computed({
       get() {
         const prop = is.isArray(props.column.field) ? props.column.field[0] : props.column.field;
@@ -92,6 +108,12 @@ const _sfc_main = {
         form.setValueByProp(props.model, prop, val);
       }
     });
+    const columnConfig = vue.computed(() => {
+      return {
+        ...props.column,
+        attrs: columnAttrs.value
+      };
+    });
     const columnAttrs = vue.computed(() => {
       return {
         ...props.column.attrs,
@@ -99,6 +121,55 @@ const _sfc_main = {
         placeholder: form.columnPlaceholderHandler(props.column, props.model)
       };
     });
+    async function obtainOptions(isMountedLoad = false) {
+      return new Promise(async (resolve, reject) => {
+        if (props.column.optionsFn) {
+          if (!props.column.optionsFn) return;
+          props.column.optionsLoading = true;
+          props.column.optionsError = "";
+          props.column.attrs.options = [];
+          if (!(isMountedLoad && props.column.isDefaultGetData === false)) {
+            try {
+              props.column.attrs.options = await props.column.optionsFn(
+                props.column,
+                props.model
+              );
+              props.column.optionsError = "";
+              resolve();
+            } catch (err) {
+              props.column.optionsError = "error";
+              console.error(err);
+              reject();
+            }
+          } else {
+            resolve();
+          }
+        } else if (props.column.type === "org-cascader") {
+          if (orgCascaderRef.value) {
+            props.column.optionsLoading = true;
+            props.column.optionsError = "";
+            try {
+              await orgCascaderRef.value.getData();
+              resolve();
+            } catch {
+              props.column.optionsError = "error";
+              reject();
+            }
+          } else {
+            resolve();
+          }
+        } else {
+          resolve();
+        }
+        props.column.optionsLoading = false;
+      });
+    }
+    function getOptionsHandler(props2, column) {
+      if (props2.column.optionsLoading) {
+        return [];
+      }
+      return index.optionsHandler(props2, props2.column);
+    }
     function getColumnRuleHandler(column, model) {
       if (!index.isRequired(props, column) && formItemRef.value) {
         formItemRef.value.clearValidate();
@@ -108,8 +179,51 @@ const _sfc_main = {
     function onChangeHandler() {
       const { onChange } = props.column;
       if (!onChange) return;
-      onChange(props.column, props.model);
+      onChange(props.column, props.model, props.index);
+    }
+    async function onReloadOptions() {
+      if (props.column.optionsError === "error") {
+        try {
+          await obtainOptions();
+        } catch {
+        }
+        formContext?.emitOptionsStatus();
+      }
     }
+    const context = vue.reactive({
+      ...vue.toRefs(props),
+      columnProp,
+      propString,
+      columnConfig,
+      columnAttrs,
+      obtainOptions,
+      optionsLoading: vue.computed(() => props.column.optionsLoading),
+      optionsError: vue.computed(() => props.column.optionsError),
+      options: vue.computed(() => {
+        return getOptionsHandler(props, props.column);
+      })
+    });
+    vue.onMounted(() => {
+      if (propString.value) {
+        formContext?.addField(context);
+      }
+      vue.watch(
+        () => formContext.model.errorMsg,
+        () => {
+          const optionsError = props.column.optionsError;
+          if (optionsError === "error") {
+            props.column.optionsError = "";
+            setTimeout(() => {
+              props.column.optionsError = "error";
+            }, 1);
+          }
+        },
+        { immediate: true, deep: true }
+      );
+    });
+    vue.onBeforeUnmount(() => {
+      formContext?.removeField(context);
+    });
     return (_ctx, _cache) => {
       return !vue.unref(index.columnVisibleHandler)(props, __props.column) ? (vue.openBlock(), vue.createElementBlock("div", {
         key: 0,
@@ -126,14 +240,15 @@ const _sfc_main = {
         id: __props.column.id,
         prop: columnProp.value,
         rules: getColumnRuleHandler(__props.column, props.model),
-        style: vue.normalizeStyle(vue.unref(index.columnItemStyle)(props, __props.column))
-      }, {
+        style: vue.normalizeStyle(vue.unref(index.columnItemStyle)(props, __props.column)),
+        error: __props.column.optionsError,
+        "show-message": showMessage.value
+      }, vue.createSlots({
         default: vue.withCtx(() => [
-          vue.createCommentVNode(" \u8868\u5355\u9879label "),
           vue.createElementVNode("div", { class: "w-full flex justify-between text-main" }, [
             vue.createElementVNode("div", { class: "flex items-center" }, [
               vue.renderSlot(_ctx.$slots, __props.column.labelSlot, {
-                column: __props.column,
+                column: columnConfig.value,
                 model: __props.model,
                 required: vue.unref(index.isRequired)(props, __props.column)
               }, () => [
@@ -162,7 +277,11 @@ const _sfc_main = {
                     1
                     /* TEXT */
                   )) : vue.createCommentVNode("v-if", true),
-                  vue.renderSlot(_ctx.$slots, __props.column.tooltipContentSlot)
+                  vue.renderSlot(_ctx.$slots, __props.column.tooltipContentSlot, {
+                    column: columnConfig.value,
+                    model: __props.model,
+                    required: vue.unref(index.isRequired)(props, __props.column)
+                  })
                 ]),
                 default: vue.withCtx(() => [
                   vue.createElementVNode("span", { class: "text-xs text-theme ml-2" }, [
@@ -188,13 +307,12 @@ const _sfc_main = {
               class: "ml-2 flex items-center"
             }, [
               vue.renderSlot(_ctx.$slots, __props.column.rightSlot, {
-                column: __props.column,
+                column: columnConfig.value,
                 model: __props.model,
                 required: vue.unref(index.isRequired)(props, __props.column)
               })
             ])) : vue.createCommentVNode("v-if", true)
           ]),
-          vue.createCommentVNode(" \u5185\u5BB9\u4EC5\u67E5\u770B "),
           vue.unref(index.isReadonly)(props, __props.column) || !__props.column.type && !__props.column.slot ? (vue.openBlock(), vue.createElementBlock(
             "div",
             {
@@ -230,9 +348,10 @@ const _sfc_main = {
             vue.Fragment,
             { key: 1 },
             [
+              vue.createCommentVNode(" \u8868\u5355\u9879 "),
               vue.createCommentVNode(" \u81EA\u5B9A\u4E49\u5177\u540D\u63D2\u69FD "),
               __props.column.slot && _ctx.$slots[__props.column.slot] ? vue.renderSlot(_ctx.$slots, __props.column.slot, {
-                column: __props.column,
+                column: columnConfig.value,
                 model: __props.model,
                 required: vue.unref(index.isRequired)(props, __props.column)
               }, void 0, void 0, 0) : __props.column.type === "input" ? (vue.openBlock(), vue.createElementBlock(
@@ -260,15 +379,77 @@ const _sfc_main = {
                     "onUpdate:modelValue": ($event) => bindValue.value = $event
                   }, columnAttrs.value, {
                     disabled: vue.unref(index.isDisabled)(props, __props.column),
-                    options: vue.unref(index.optionsHandler)(props, __props.column),
+                    options: getOptionsHandler(props, __props.column),
                     onChange: onChangeHandler
-                  }), null, 16, ["modelValue", "onUpdate:modelValue", "disabled", "options"])
+                  }), vue.createSlots({
+                    _: 2
+                    /* DYNAMIC */
+                  }, [
+                    __props.column.optionsLoading ? {
+                      name: "empty",
+                      fn: vue.withCtx(() => [
+                        vue.createElementVNode("div", { class: "w-full flex items-center justify-center py-2 gap-1.5 text-main text-xs whitespace-nowrap" }, [
+                          vue.createVNode(vue.unref(elementPlus.ElIcon), {
+                            size: "16",
+                            class: "is-loading text-theme"
+                          }, {
+                            default: vue.withCtx(() => [
+                              vue.createVNode(vue.unref(iconsVue.Loading))
+                            ]),
+                            _: 1
+                            /* STABLE */
+                          }),
+                          vue.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" ? (vue.openBlock(), vue.createElementBlock(
+              )) : __props.column.type === "select-v2" ? (vue.openBlock(), vue.createElementBlock(
                 vue.Fragment,
                 { key: 3 },
+                [
+                  vue.createCommentVNode(" \u865A\u62DF\u5316\u9009\u62E9\u6846 "),
+                  vue.createVNode(vue.unref(elementPlus.ElSelectV2), vue.mergeProps({
+                    modelValue: bindValue.value,
+                    "onUpdate:modelValue": ($event) => bindValue.value = $event
+                  }, columnAttrs.value, {
+                    disabled: vue.unref(index.isDisabled)(props, __props.column),
+                    options: getOptionsHandler(props, __props.column),
+                    onChange: onChangeHandler
+                  }), vue.createSlots({
+                    _: 2
+                    /* DYNAMIC */
+                  }, [
+                    __props.column.optionsLoading ? {
+                      name: "empty",
+                      fn: vue.withCtx(() => [
+                        vue.createElementVNode("div", { class: "w-full flex items-center justify-center py-2 gap-1.5 text-main text-xs whitespace-nowrap" }, [
+                          vue.createVNode(vue.unref(elementPlus.ElIcon), {
+                            size: "16",
+                            class: "is-loading text-theme"
+                          }, {
+                            default: vue.withCtx(() => [
+                              vue.createVNode(vue.unref(iconsVue.Loading))
+                            ]),
+                            _: 1
+                            /* STABLE */
+                          }),
+                          vue.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" ? (vue.openBlock(), vue.createElementBlock(
+                vue.Fragment,
+                { key: 4 },
                 [
                   vue.createCommentVNode(" \u65E5\u671F\u9009\u62E9\u6846 "),
                   ["datetimerange", "daterange", "monthrange", "yearrange"].includes(
@@ -301,7 +482,7 @@ const _sfc_main = {
                 /* STABLE_FRAGMENT */
               )) : __props.column.type === "time-picker" ? (vue.openBlock(), vue.createElementBlock(
                 vue.Fragment,
-                { key: 4 },
+                { key: 5 },
                 [
                   vue.createCommentVNode(" \u65F6\u95F4\u9009\u62E9\u6846 "),
                   columnAttrs.value.isRange ? (vue.openBlock(), vue.createBlock(vue.unref(index$5.HyTimePicker), vue.mergeProps({
@@ -332,7 +513,7 @@ const _sfc_main = {
                 /* STABLE_FRAGMENT */
               )) : __props.column.type === "radio" ? (vue.openBlock(), vue.createElementBlock(
                 vue.Fragment,
-                { key: 5 },
+                { key: 6 },
                 [
                   vue.createCommentVNode(" \u5355\u9009 "),
                   vue.createVNode(vue.unref(elementPlus.ElRadioGroup), vue.mergeProps({
@@ -340,7 +521,7 @@ const _sfc_main = {
                     "onUpdate:modelValue": ($event) => bindValue.value = $event
                   }, columnAttrs.value, {
                     disabled: vue.unref(index.isDisabled)(props, __props.column),
-                    options: vue.unref(index.optionsHandler)(props, __props.column),
+                    options: getOptionsHandler(props, __props.column),
                     onChange: onChangeHandler
                   }), null, 16, ["modelValue", "onUpdate:modelValue", "disabled", "options"])
                 ],
@@ -348,7 +529,7 @@ const _sfc_main = {
                 /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
               )) : __props.column.type === "radio-group" ? (vue.openBlock(), vue.createElementBlock(
                 vue.Fragment,
-                { key: 6 },
+                { key: 7 },
                 [
                   vue.createCommentVNode(" \u5355\u9009\u6309\u94AE "),
                   vue.createVNode(vue.unref(index$6.HyRadioGroup), vue.mergeProps({
@@ -356,7 +537,7 @@ const _sfc_main = {
                     "onUpdate:modelValue": ($event) => bindValue.value = $event
                   }, columnAttrs.value, {
                     disabled: vue.unref(index.isDisabled)(props, __props.column),
-                    options: vue.unref(index.optionsHandler)(props, __props.column),
+                    options: getOptionsHandler(props, __props.column),
                     size: __props.size,
                     onChange: onChangeHandler
                   }), null, 16, ["modelValue", "onUpdate:modelValue", "disabled", "options", "size"])
@@ -365,7 +546,7 @@ const _sfc_main = {
                 /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
               )) : __props.column.type === "checkbox" ? (vue.openBlock(), vue.createElementBlock(
                 vue.Fragment,
-                { key: 7 },
+                { key: 8 },
                 [
                   vue.createCommentVNode(" \u591A\u9009 "),
                   vue.createVNode(vue.unref(elementPlus.ElCheckboxGroup), vue.mergeProps({
@@ -373,7 +554,7 @@ const _sfc_main = {
                     "onUpdate:modelValue": ($event) => bindValue.value = $event
                   }, columnAttrs.value, {
                     disabled: vue.unref(index.isDisabled)(props, __props.column),
-                    options: vue.unref(index.optionsHandler)(props, __props.column),
+                    options: getOptionsHandler(props, __props.column),
                     onChange: onChangeHandler
                   }), null, 16, ["modelValue", "onUpdate:modelValue", "disabled", "options"])
                 ],
@@ -381,7 +562,7 @@ const _sfc_main = {
                 /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
               )) : __props.column.type === "switch" ? (vue.openBlock(), vue.createElementBlock(
                 vue.Fragment,
-                { key: 8 },
+                { key: 9 },
                 [
                   vue.createCommentVNode(" \u5F00\u5173 "),
                   vue.createVNode(vue.unref(elementPlus.ElSwitch), vue.mergeProps({
@@ -399,7 +580,7 @@ const _sfc_main = {
                 /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
               )) : __props.column.type === "input-number" ? (vue.openBlock(), vue.createElementBlock(
                 vue.Fragment,
-                { key: 9 },
+                { key: 10 },
                 [
                   vue.createCommentVNode(" \u6570\u5B57\u8F93\u5165\u6846 "),
                   vue.createVNode(vue.unref(elementPlus.ElInputNumber), vue.mergeProps({
@@ -414,10 +595,12 @@ const _sfc_main = {
                 /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
               )) : __props.column.type === "org-cascader" ? (vue.openBlock(), vue.createElementBlock(
                 vue.Fragment,
-                { key: 10 },
+                { key: 11 },
                 [
                   vue.createCommentVNode(" \u90E8\u95E8\u7EA7\u8054\u9009\u62E9\u6846 "),
                   vue.createVNode(vue.unref(index$7.HyOrgCascader), vue.mergeProps({
+                    ref_key: "orgCascaderRef",
+                    ref: orgCascaderRef,
                     modelValue: bindValue.value,
                     "onUpdate:modelValue": ($event) => bindValue.value = $event,
                     class: "w-full"
@@ -430,17 +613,41 @@ const _sfc_main = {
                 /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
               )) : __props.column.type === "cascader" ? (vue.openBlock(), vue.createElementBlock(
                 vue.Fragment,
-                { key: 11 },
+                { key: 12 },
                 [
                   vue.createCommentVNode(" \u7EA7\u8054\u9009\u62E9\u6846 "),
                   vue.createVNode(vue.unref(elementPlus.ElCascader), vue.mergeProps({
                     modelValue: bindValue.value,
                     "onUpdate:modelValue": ($event) => bindValue.value = $event
                   }, columnAttrs.value, {
+                    class: "w-full",
                     disabled: vue.unref(index.isDisabled)(props, __props.column),
-                    options: vue.unref(index.optionsHandler)(props, __props.column),
+                    options: getOptionsHandler(props, __props.column),
                     onChange: onChangeHandler
-                  }), null, 16, ["modelValue", "onUpdate:modelValue", "disabled", "options"])
+                  }), vue.createSlots({
+                    _: 2
+                    /* DYNAMIC */
+                  }, [
+                    __props.column.optionsLoading ? {
+                      name: "empty",
+                      fn: vue.withCtx(() => [
+                        vue.createElementVNode("div", { class: "w-full flex items-center justify-center py-2 gap-1.5 text-main text-xs whitespace-nowrap" }, [
+                          vue.createVNode(vue.unref(elementPlus.ElIcon), {
+                            size: "16",
+                            class: "is-loading text-theme"
+                          }, {
+                            default: vue.withCtx(() => [
+                              vue.createVNode(vue.unref(iconsVue.Loading))
+                            ]),
+                            _: 1
+                            /* STABLE */
+                          }),
+                          vue.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 */
@@ -450,9 +657,24 @@ const _sfc_main = {
             /* STABLE_FRAGMENT */
           ))
         ]),
-        _: 3
-        /* FORWARDED */
-      }, 8, ["id", "prop", "rules", "style"])) : vue.createCommentVNode("v-if", true);
+        _: 2
+        /* DYNAMIC */
+      }, [
+        __props.column.optionsError ? {
+          name: "error",
+          fn: vue.withCtx(() => [
+            vue.createElementVNode("div", { class: "hy-el-form-item__error" }, [
+              vue.createElementVNode("span", null, "\u6570\u636E\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7"),
+              vue.createElementVNode("span", {
+                class: "text-theme cursor-pointer",
+                onClick: onReloadOptions
+              }, "[\u91CD\u65B0\u52A0\u8F7D]"),
+              vue.createElementVNode("span", null, "\u6216\u8054\u7CFB\u7BA1\u7406\u5458")
+            ])
+          ]),
+          key: "0"
+        } : void 0
+      ]), 1032, ["id", "prop", "rules", "style", "error", "show-message"])) : vue.createCommentVNode("v-if", true);
     };
   }
 };

package/lib/components/hyForm/cpns/locationSelect.vue.js

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

package/lib/components/hyForm/form.vue.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var vue = require('vue');
 var elementPlus = require('element-plus');
-require('@element-plus/icons-vue');
 require('../../hooks/index.js');
 require('../../utils/index.js');
 var formItem = require('./cpns/formItem.vue.js');
@@ -55,12 +54,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: String,
       default: "default"
       // 'large' | 'default' | 'small'
+    },
+    showMessage: {
+      type: Boolean,
+      default: true
     }
   },
   emits: ["on-allMapSelect", "complete"],
   setup(__props, { expose: __expose, emit: __emit }) {
-    const emit = __emit;
     const props = __props;
+    const emits = __emit;
     const { t } = useLocale.useLocale();
     const formTemplateRef = vue.useTemplateRef("formTemplateRef");
     const formColumnMap = vue.computed(() => {
@@ -83,52 +86,118 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     const allMapSelect = vue.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 = vue.reactive([]);
+    function addField(field) {
+      fields.push(field);
+    }
+    const removeField = (field) => {
+      if (field.propString) {
+        fields.splice(fields.indexOf(field), 1);
+      }
+    };
+    function filterFields(fields2 = [], keys = []) {
+      const filterKeys = keys.map((prop) => is.isArray(prop) ? prop.join(".") : prop);
+      return filterKeys.length ? fields2.filter(
+        (field) => field.propString && filterKeys.includes(field.propString)
+      ) : fields2;
+    }
+    async function obtainOptionsFields(keys, isMountedLoad = false) {
+      const filteredFields = filterFields(fields, keys);
+      await Promise.allSettled(
+        filteredFields.map((field) => field.obtainOptions(isMountedLoad))
+      );
+    }
+    async function getOptions(isMountedLoad = false) {
+      await obtainOptionsFields([], isMountedLoad);
+      emitOptionsStatus();
+    }
+    async function getOptionsFields(keys) {
+      await obtainOptionsFields(keys);
+      emitOptionsStatus();
     }
+    async function getOptionsError() {
+      const filteredFields = fields.filter(
+        (field) => field.propString && field.optionsError
+      );
+      await Promise.allSettled(filteredFields.map((field) => field.obtainOptions()));
+      emitOptionsStatus();
+    }
+    function emitOptionsStatus() {
+      const hasError = fields.some((item) => item.optionsError === "error");
+      emits("optionsStatus", { result: !hasError });
+    }
+    vue.provide(
+      index.formContextKey,
+      vue.reactive({
+        ...vue.toRefs(props),
+        emits,
+        addField,
+        removeField,
+        emitOptionsStatus
+      })
+    );
+    vue.onMounted(() => {
+      getOptions(true);
+    });
     __expose({
       validate: async (callback) => {
         await vue.nextTick();
         return vue.unref(formTemplateRef).validate(callback);
       },
-      validateField: async (fields) => {
+      validateField: async (fields2) => {
         await vue.nextTick();
-        return vue.unref(formTemplateRef).validateField(fields);
+        return vue.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);
         }
         useAppForm.resetAppFormValue(columns, props.model);
-        vue.unref(formTemplateRef).clearValidate(fields);
+        vue.unref(formTemplateRef).clearValidate(fields2);
       },
-      scrollToField: async (fields) => {
+      scrollToField: async (fields2) => {
         await vue.nextTick();
-        vue.unref(formTemplateRef).scrollToField(fields);
+        vue.unref(formTemplateRef).scrollToField(fields2);
       },
-      clearValidate: async (fields) => {
+      clearValidate: async (fields2) => {
         await vue.nextTick();
-        vue.unref(formTemplateRef).clearValidate(fields);
+        vue.unref(formTemplateRef).clearValidate(fields2);
       },
       fields: vue.computed(() => {
         return vue.unref(formTemplateRef)?.fields || [];
       }),
-      getField: async (fields) => {
+      getField: async (fields2) => {
         await vue.nextTick();
-        return vue.unref(formTemplateRef).getField(fields);
+        return vue.unref(formTemplateRef).getField(fields2);
       },
       setMarker: (latlng) => {
         if (locationSelectRef.value) {
           is.isArray(locationSelectRef.value) ? locationSelectRef.value.map((item) => item.setMarker(latlng)) : locationSelectRef.value.setMarker(latlng);
         }
-      }
+      },
+      clearMarker: () => {
+        if (locationSelectRef.value) {
+          is.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 vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElForm), vue.mergeProps({

package/lib/components/hyForm/js/index.js

@@ -8,6 +8,7 @@ var is = require('../../../utils/is.js');
 var form = require('../../../utils/form.js');
 var useLocale = require('../../../hooks/useLocale.js');
 
+const formContextKey = /* @__PURE__ */ Symbol("formContextKey");
 function columnItemStyle(props, column) {
   const style = {};
   let span = handler.funRunHandler(column.span, column, props.model);
@@ -125,6 +126,7 @@ exports.columnHelpHandler = columnHelpHandler;
 exports.columnItemStyle = columnItemStyle;
 exports.columnShowHandler = columnShowHandler;
 exports.columnVisibleHandler = columnVisibleHandler;
+exports.formContextKey = formContextKey;
 exports.isDisabled = isDisabled;
 exports.isReadonly = isReadonly;
 exports.isRequired = isRequired;