hy-dispatch-ui-v3 0.2.66 → 0.2.67

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

@@ -1,12 +1,12 @@
-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 { inject, useTemplateRef, computed, reactive, toRefs, onMounted, watch, 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 { formContextKey, isRequired, optionsHandler, columnVisibleHandler, columnItemStyle, columnShowHandler, columnHelpHandler, isReadonly, renderText, isDisabled } from '../js/index.mjs';
+import { formContextKey, optionsHandler, isRequired, 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';
+import { isBoolean, isArray } from '../../../utils/is.mjs';
 import { setValueByProp, getValueByProp, columnPlaceholderHandler, columnLabelHandler, columnRuleHandler } from '../../../utils/form.mjs';
 import { HyTooltip } from '../../hyTooltip/index.mjs';
 import { HyIcon } from '../../hyIcon/index.mjs';
@@ -64,6 +64,15 @@ const _sfc_main = {
     const formContext = inject(formContextKey);
     const formItemRef = useTemplateRef("formItemRef");
     const orgCascaderRef = useTemplateRef("orgCascaderRef");
+    const showMessage = computed(() => {
+      if (columnConfig.value.optionsError) {
+        return true;
+      }
+      if (isBoolean(columnConfig.value.showMessage)) {
+        return columnConfig.value.showMessage;
+      }
+      return formContext.showMessage;
+    });
     const columnProp = computed(() => {
       let field = isArray(props.column.field) ? props.column.field[0] : props.column.field;
       if (props.parentProp) {
@@ -108,36 +117,54 @@ 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";
+    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 [];
       }
-      optionsLoading.value = false;
+      return optionsHandler(props2, props2.column);
     }
     function getColumnRuleHandler(column, model) {
       if (!isRequired(props, column) && formItemRef.value) {
@@ -150,6 +177,15 @@ const _sfc_main = {
       if (!onChange) return;
       onChange(props.column, props.model, props.index);
     }
+    async function onReloadOptions() {
+      if (props.column.optionsError === "error") {
+        try {
+          await obtainOptions();
+        } catch {
+        }
+        formContext?.emitOptionsStatus();
+      }
+    }
     const context = reactive({
       ...toRefs(props),
       columnProp,
@@ -157,16 +193,29 @@ const _sfc_main = {
       columnConfig,
       columnAttrs,
       obtainOptions,
-      optionsLoading,
-      optionsError,
+      optionsLoading: computed(() => props.column.optionsLoading),
+      optionsError: computed(() => props.column.optionsError),
       options: computed(() => {
-        return optionsHandler(props, props.column);
+        return getOptionsHandler(props, props.column);
       })
     });
     onMounted(() => {
       if (propString.value) {
         formContext?.addField(context);
       }
+      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 }
+      );
     });
     onBeforeUnmount(() => {
       formContext?.removeField(context);
@@ -188,7 +237,8 @@ const _sfc_main = {
         prop: columnProp.value,
         rules: getColumnRuleHandler(__props.column, props.model),
         style: normalizeStyle(unref(columnItemStyle)(props, __props.column)),
-        error: optionsError.value
+        error: __props.column.optionsError,
+        "show-message": showMessage.value
       }, createSlots({
         default: withCtx(() => [
           createElementVNode("div", { class: "w-full flex justify-between text-main" }, [
@@ -325,13 +375,13 @@ const _sfc_main = {
                     "onUpdate:modelValue": ($event) => bindValue.value = $event
                   }, columnAttrs.value, {
                     disabled: unref(isDisabled)(props, __props.column),
-                    options: unref(optionsHandler)(props, __props.column),
+                    options: getOptionsHandler(props, __props.column),
                     onChange: onChangeHandler
                   }), createSlots({
                     _: 2
                     /* DYNAMIC */
                   }, [
-                    optionsLoading.value ? {
+                    __props.column.optionsLoading ? {
                       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" }, [
@@ -364,13 +414,13 @@ const _sfc_main = {
                     "onUpdate:modelValue": ($event) => bindValue.value = $event
                   }, columnAttrs.value, {
                     disabled: unref(isDisabled)(props, __props.column),
-                    options: unref(optionsHandler)(props, __props.column),
+                    options: getOptionsHandler(props, __props.column),
                     onChange: onChangeHandler
                   }), createSlots({
                     _: 2
                     /* DYNAMIC */
                   }, [
-                    optionsLoading.value ? {
+                    __props.column.optionsLoading ? {
                       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" }, [
@@ -467,7 +517,7 @@ const _sfc_main = {
                     "onUpdate:modelValue": ($event) => bindValue.value = $event
                   }, columnAttrs.value, {
                     disabled: unref(isDisabled)(props, __props.column),
-                    options: unref(optionsHandler)(props, __props.column),
+                    options: getOptionsHandler(props, __props.column),
                     onChange: onChangeHandler
                   }), null, 16, ["modelValue", "onUpdate:modelValue", "disabled", "options"])
                 ],
@@ -483,7 +533,7 @@ const _sfc_main = {
                     "onUpdate:modelValue": ($event) => bindValue.value = $event
                   }, columnAttrs.value, {
                     disabled: unref(isDisabled)(props, __props.column),
-                    options: unref(optionsHandler)(props, __props.column),
+                    options: getOptionsHandler(props, __props.column),
                     size: __props.size,
                     onChange: onChangeHandler
                   }), null, 16, ["modelValue", "onUpdate:modelValue", "disabled", "options", "size"])
@@ -500,7 +550,7 @@ const _sfc_main = {
                     "onUpdate:modelValue": ($event) => bindValue.value = $event
                   }, columnAttrs.value, {
                     disabled: unref(isDisabled)(props, __props.column),
-                    options: unref(optionsHandler)(props, __props.column),
+                    options: getOptionsHandler(props, __props.column),
                     onChange: onChangeHandler
                   }), null, 16, ["modelValue", "onUpdate:modelValue", "disabled", "options"])
                 ],
@@ -568,13 +618,13 @@ const _sfc_main = {
                   }, columnAttrs.value, {
                     class: "w-full",
                     disabled: unref(isDisabled)(props, __props.column),
-                    options: unref(optionsHandler)(props, __props.column),
+                    options: getOptionsHandler(props, __props.column),
                     onChange: onChangeHandler
                   }), createSlots({
                     _: 2
                     /* DYNAMIC */
                   }, [
-                    optionsLoading.value ? {
+                    __props.column.optionsLoading ? {
                       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" }, [
@@ -606,21 +656,21 @@ const _sfc_main = {
         _: 2
         /* DYNAMIC */
       }, [
-        optionsError.value ? {
+        __props.column.optionsError ? {
           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
+                onClick: onReloadOptions
               }, "[\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);
+      ]), 1032, ["id", "prop", "rules", "style", "error", "show-message"])) : createCommentVNode("v-if", true);
     };
   }
 };

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

@@ -1,4 +1,4 @@
-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 { defineComponent, useTemplateRef, computed, ref, reactive, provide, toRefs, onMounted, nextTick, unref, openBlock, createBlock, mergeProps, withCtx, createElementVNode, normalizeStyle, createCommentVNode, createElementBlock, Fragment, renderList, normalizeClass, toDisplayString, createVNode, createSlots, renderSlot } from 'vue';
 import { ElForm, ElDivider } from 'element-plus';
 import '../../hooks/index.mjs';
 import '../../utils/index.mjs';
@@ -50,6 +50,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: String,
       default: "default"
       // 'large' | 'default' | 'small'
+    },
+    showMessage: {
+      type: Boolean,
+      default: true
     }
   },
   emits: ["on-allMapSelect", "complete"],
@@ -88,7 +92,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       fields.push(field);
     }
     const removeField = (field) => {
-      if (unref(field.columnAttrs)) {
+      if (field.propString) {
         fields.splice(fields.indexOf(field), 1);
       }
     };
@@ -98,21 +102,30 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         (field) => field.propString && filterKeys.includes(field.propString)
       ) : fields2;
     }
-    async function obtainOptionsFields(keys) {
+    async function obtainOptionsFields(keys, isMountedLoad = false) {
       const filteredFields = filterFields(fields, keys);
-      await Promise.allSettled(filteredFields.map((field) => field.obtainOptions()));
+      await Promise.allSettled(
+        filteredFields.map((field) => field.obtainOptions(isMountedLoad))
+      );
     }
-    async function getOptions() {
-      await obtainOptionsFields();
+    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 });
     }
     provide(
       formContextKey,
@@ -120,11 +133,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         ...toRefs(props),
         emits,
         addField,
-        removeField
+        removeField,
+        emitOptionsStatus
       })
     );
     onMounted(() => {
-      getOptions();
+      getOptions(true);
     });
     __expose({
       validate: async (callback) => {

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

@@ -23,7 +23,7 @@ function appFormItemHandler(column = {}) {
     return {
       ...column,
       attrs: {
-        maxlength: attrs.type === "textarea" ? 255 : attrs.type === "text" ? 100 : void 0,
+        maxlength: attrs.type === "text" ? 256 : void 0,
         ...attrs
       }
     };

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

@@ -1,5 +1,5 @@
 import { InitMap } from '../../../utils/map/index.mjs';
-import { nextTick } from 'vue';
+import { shallowRef, nextTick } from 'vue';
 
 const useAppMapWrapper = (hy) => {
   const {
@@ -7,8 +7,8 @@ const useAppMapWrapper = (hy) => {
     mapRef,
     emits
   } = hy;
-  const hyMap = null;
-  const map = null;
+  let hyMap = shallowRef(null);
+  let map = shallowRef(null);
   function newMap(mapType) {
     const mapFilters = [
       {
@@ -92,7 +92,7 @@ const useAppMapWrapper = (hy) => {
         filter: "saturate(180%) brightness(105%) contrast(115%)"
       }
     ];
-    hy.hyMap = new InitMap({
+    hy.hyMap.value = new InitMap({
       ...mapConfig,
       mapType,
       BM: window.BM
@@ -115,7 +115,7 @@ const useAppMapWrapper = (hy) => {
     }, 800);
   }
   function initMap() {
-    hy.map = hy.hyMap.InitMap(mapRef.value, {
+    hy.map.value = hy.hyMap.value.InitMap(mapRef.value, {
       minZoom: mapConfig.minZoom || 8,
       maxZoom: mapConfig.maxZoom || 18,
       center: mapConfig.center || {
@@ -125,7 +125,7 @@ const useAppMapWrapper = (hy) => {
       zoom: mapConfig.zoom || 14,
       completeCallbacks: () => {
         nextTick(() => {
-          emits("complete", hy.hyMap, hy.map);
+          emits("complete", hy.hyMap.value, hy.map.value);
         });
       }
     });

package/es/components/hyMap/map.vue.mjs

@@ -1,7 +1,9 @@
-import { ref, onMounted, openBlock, createElementBlock, createElementVNode } from 'vue';
+import { ref, onMounted, onBeforeUnmount, openBlock, createElementBlock, createBlock, unref } from 'vue';
 import '../../hooks/index.mjs';
+import '../../index.mjs';
 import { useAppMapWrapper } from './js/index.mjs';
 import { useMixins } from '../../hooks/useMixins.mjs';
+import { HyNoPermissionsMap } from '../hyNoPermissionsMap/index.mjs';
 import { useMapConfig } from '../../hooks/useMapConfig.mjs';
 
 import "../../static/map/bigemap.css";
@@ -44,13 +46,21 @@ const _sfc_main = {
       [useAppMapWrapper]
     );
     onMounted(() => {
-      newMap(props.mapType);
+      if (props.mapType !== "nomap") {
+        newMap(props.mapType);
+      }
+    });
+    onBeforeUnmount(() => {
+      map.value?.removeMap();
+      map.value = null;
+      hyMap.value = null;
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", { class: "w-full h-full box-border border-border border relative" }, [
-        createElementVNode(
+        props.mapType !== "nomap" ? (openBlock(), createElementBlock(
           "div",
           {
+            key: 0,
             ref_key: "mapRef",
             ref: mapRef,
             class: "w-full h-full rounded overflow-hidden"
@@ -58,7 +68,7 @@ const _sfc_main = {
           null,
           512
           /* NEED_PATCH */
-        )
+        )) : (openBlock(), createBlock(unref(HyNoPermissionsMap), { key: 1 }))
       ]);
     };
   }

package/es/components/hyOrgCascader/orgCascader.vue.mjs

@@ -75,6 +75,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       default: () => {
         return true;
       }
+    },
+    onVisibleChange: {
+      type: Function
     }
   }, {
     "modelValue": { type: [Array, String, Number] },
@@ -139,6 +142,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     }
     function onVisibleChangeHandler(type) {
       focusType.value = type;
+      onVisibleChange(type);
     }
     if (props.defaultGetData) {
       getCascaderData();
@@ -260,7 +264,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
           filterable: "",
           "show-all-levels": false,
           "virtual-scroll": "",
-          onChange: onChangeHanlder
+          onChange: onChangeHanlder,
+          onVisibleChange: __props.onVisibleChange
         }, createSlots({
           _: 2
           /* DYNAMIC */
@@ -284,7 +289,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             ]),
             key: "0"
           } : void 0
-        ]), 1032, ["modelValue", "onUpdate:modelValue", "class", "size", "options", "clearable", "disabled", "placeholder"]))
+        ]), 1032, ["modelValue", "onUpdate:modelValue", "class", "size", "options", "clearable", "disabled", "placeholder", "onVisibleChange"]))
       ]);
     };
   }