hy-dispatch-ui-v3 0.2.66 → 0.2.68

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

@@ -1,19 +1,20 @@
-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, createTextVNode, 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';
+import { $t } from '../../../hooks/useLocale.mjs';
 import { HyInput } from '../../hyInput/index.mjs';
 import { HyDatePicker } from '../../hyDatePicker/index.mjs';
 import { HyTimePicker } from '../../hyTimePicker/index.mjs';
 import { HyRadioGroup } from '../../hyRadioGroup/index.mjs';
+import { HyCheckboxGroup } from '../../hyCheckboxGroup/index.mjs';
 import { HyOrgCascader } from '../../hyOrgCascader/index.mjs';
 
 const _sfc_main = {
@@ -59,11 +60,19 @@ const _sfc_main = {
     }
   },
   setup(__props) {
-    const { t } = useLocale();
     const props = __props;
     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,65 @@ 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;
+          onRequesting();
+          if (!(isMountedLoad && props.column.isDefaultGetData === false)) {
+            try {
+              const options = await props.column.optionsFn(props.column, props.model);
+              onFulfilled(options);
+              resolve();
+            } catch (err) {
+              onRejected();
+              console.error(err);
+              reject();
+            }
+          } else {
+            resolve();
           }
+        } else if (props.column.type === "org-cascader") {
+          if (orgCascaderRef.value) {
+            try {
+              onRequesting();
+              await orgCascaderRef.value.getData();
+              onFulfilled();
+              resolve();
+            } catch {
+              props.column.optionsError = "error";
+              onRejected();
+              reject();
+            }
+          } else {
+            resolve();
+          }
+        } else {
+          resolve();
         }
+        props.column.optionsLoading = false;
+      });
+    }
+    function onRequesting() {
+      props.column.optionsLoading = true;
+      props.column.optionsError = "";
+      props.column.attrs.options = [];
+    }
+    function onFulfilled(options = []) {
+      props.column.optionsLoading = false;
+      props.column.optionsError = "";
+      props.column.attrs.options = options;
+    }
+    function onRejected() {
+      props.column.optionsLoading = false;
+      props.column.optionsError = "error";
+      props.column.attrs.options = [];
+    }
+    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 +188,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 +204,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,23 +248,24 @@ 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" }, [
             createElementVNode("div", { class: "flex items-center" }, [
-              renderSlot(_ctx.$slots, __props.column.labelSlot, {
-                column: columnConfig.value,
-                model: __props.model,
-                required: unref(isRequired)(props, __props.column)
-              }, () => [
-                createElementVNode(
-                  "span",
-                  { class: "text-main" },
-                  toDisplayString(unref(columnLabelHandler)(__props.column, props.model) || "\xA0"),
-                  1
-                  /* TEXT */
-                )
+              createElementVNode("span", { class: "text-main whitespace-nowrap" }, [
+                renderSlot(_ctx.$slots, __props.column.labelSlot, {
+                  column: columnConfig.value,
+                  model: __props.model,
+                  required: unref(isRequired)(props, __props.column)
+                }, () => [
+                  createTextVNode(
+                    toDisplayString(unref(columnLabelHandler)(__props.column, props.model) || "\xA0"),
+                    1
+                    /* TEXT */
+                  )
+                ])
               ]),
               unref(isRequired)(props, __props.column) ? (openBlock(), createElementBlock("span", {
                 key: 0,
@@ -238,7 +299,7 @@ const _sfc_main = {
                     createElementVNode(
                       "span",
                       null,
-                      toDisplayString(unref(t)("hy.help")),
+                      toDisplayString(unref($t)("hy.help")),
                       1
                       /* TEXT */
                     )
@@ -263,7 +324,7 @@ const _sfc_main = {
             "div",
             {
               key: 0,
-              class: normalizeClass(["w-full flex items-center text-main px-2", {
+              class: normalizeClass(["w-full flex items-center text-main px-2 box-border", {
                 "min-h-[40px]": __props.size === "large",
                 "min-h-[32px]": __props.size === "default",
                 "min-h-[24px]": __props.size === "small",
@@ -325,13 +386,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 +425,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" }, [
@@ -398,9 +459,7 @@ const _sfc_main = {
                 { key: 4 },
                 [
                   createCommentVNode(" \u65E5\u671F\u9009\u62E9\u6846 "),
-                  ["datetimerange", "daterange", "monthrange", "yearrange"].includes(
-                    columnAttrs.value?.type
-                  ) && unref(isArray)(__props.column.field) ? (openBlock(), createBlock(unref(HyDatePicker), mergeProps({
+                  ["datetimerange", "daterange", "monthrange", "yearrange"].includes(columnAttrs.value?.type) && unref(isArray)(__props.column.field) ? (openBlock(), createBlock(unref(HyDatePicker), mergeProps({
                     key: 0,
                     start: bindValue.value,
                     "onUpdate:start": ($event) => bindValue.value = $event,
@@ -467,7 +526,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 +542,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,15 +559,32 @@ 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"])
                 ],
                 2112
                 /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
-              )) : __props.column.type === "switch" ? (openBlock(), createElementBlock(
+              )) : __props.column.type === "checkbox-group" ? (openBlock(), createElementBlock(
                 Fragment,
                 { key: 9 },
+                [
+                  createCommentVNode(" \u591A\u9009\u6309\u94AE "),
+                  createVNode(unref(HyCheckboxGroup), mergeProps({
+                    modelValue: bindValue.value,
+                    "onUpdate:modelValue": ($event) => bindValue.value = $event
+                  }, columnAttrs.value, {
+                    disabled: unref(isDisabled)(props, __props.column),
+                    options: getOptionsHandler(props, __props.column),
+                    size: __props.size,
+                    onChange: onChangeHandler
+                  }), null, 16, ["modelValue", "onUpdate:modelValue", "disabled", "options", "size"])
+                ],
+                2112
+                /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
+              )) : __props.column.type === "switch" ? (openBlock(), createElementBlock(
+                Fragment,
+                { key: 10 },
                 [
                   createCommentVNode(" \u5F00\u5173 "),
                   createVNode(unref(ElSwitch), mergeProps({
@@ -526,7 +602,7 @@ const _sfc_main = {
                 /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
               )) : __props.column.type === "input-number" ? (openBlock(), createElementBlock(
                 Fragment,
-                { key: 10 },
+                { key: 11 },
                 [
                   createCommentVNode(" \u6570\u5B57\u8F93\u5165\u6846 "),
                   createVNode(unref(ElInputNumber), mergeProps({
@@ -541,7 +617,7 @@ const _sfc_main = {
                 /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
               )) : __props.column.type === "org-cascader" ? (openBlock(), createElementBlock(
                 Fragment,
-                { key: 11 },
+                { key: 12 },
                 [
                   createCommentVNode(" \u90E8\u95E8\u7EA7\u8054\u9009\u62E9\u6846 "),
                   createVNode(unref(HyOrgCascader), mergeProps({
@@ -552,6 +628,10 @@ const _sfc_main = {
                     class: "w-full"
                   }, columnAttrs.value, {
                     disabled: unref(isDisabled)(props, __props.column),
+                    defaultGetData: false,
+                    onRequesting,
+                    onFulfilled,
+                    onRejected,
                     onChange: onChangeHandler
                   }), null, 16, ["modelValue", "onUpdate:modelValue", "disabled"])
                 ],
@@ -559,7 +639,7 @@ const _sfc_main = {
                 /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
               )) : __props.column.type === "cascader" ? (openBlock(), createElementBlock(
                 Fragment,
-                { key: 12 },
+                { key: 13 },
                 [
                   createCommentVNode(" \u7EA7\u8054\u9009\u62E9\u6846 "),
                   createVNode(unref(ElCascader), mergeProps({
@@ -568,13 +648,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 +686,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/cpns/locationSelect.vue.mjs

@@ -1,10 +1,8 @@
 import { useTemplateRef, computed, onBeforeUnmount, openBlock, createElementBlock, createElementVNode, normalizeStyle, Fragment, renderList, createBlock, createSlots, withCtx, createVNode, unref, mergeProps, withKeys, renderSlot, normalizeClass, withModifiers, toDisplayString } from 'vue';
 import { ElMessage } from 'element-plus';
-import '../../../hooks/index.mjs';
 import '../../../utils/index.mjs';
 import '../../index.mjs';
 import _sfc_main$1 from './formItem.vue.mjs';
-import { useLocale } from '../../../hooks/useLocale.mjs';
 import { isArray, isNumber } from '../../../utils/is.mjs';
 import { setValueByProp, getValueByProp } from '../../../utils/form.mjs';
 import { setPoiServer } from '../../../utils/map/index.mjs';
@@ -56,7 +54,6 @@ const _sfc_main = {
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emits = __emit;
-    const { t } = useLocale();
     const containerRef = useTemplateRef("containerRef");
     const addressValue = computed({
       get() {
@@ -155,10 +152,7 @@ const _sfc_main = {
         console.log(results);
         if (results && results.length) {
           const geographicalPosition = results[0];
-          throughCoordinatePosition(
-            geographicalPosition.lng,
-            geographicalPosition.lat
-          );
+          throughCoordinatePosition(geographicalPosition.lng, geographicalPosition.lat);
         } else {
           ElMessage.error("\u6CA1\u6709\u627E\u5230\u641C\u7D22\u5730\u7406\u4F4D\u7F6E");
         }
@@ -168,22 +162,26 @@ const _sfc_main = {
       });
     }
     function throughCoordinatePosition(lng, lat) {
-      poiServer.geocoderFormat({
-        lat,
-        lng
-      }).then(({ results }) => {
-        geographicalPositionFn({
-          lng,
-          lat,
-          address: results.address,
-          name: results.address
-        });
-      }).catch(() => {
-        geographicalPositionFn({
-          lng,
+      return new Promise((resolve) => {
+        poiServer.geocoderFormat({
           lat,
-          address: `${Number(lat).toFixed(6)}\u3001${Number(lng).toFixed(6)}`,
-          name: `${Number(lat).toFixed(6)}\u3001${Number(lng).toFixed(6)}`
+          lng
+        }).then(({ results }) => {
+          geographicalPositionFn({
+            lng,
+            lat,
+            address: results.address,
+            name: results.address
+          });
+          resolve(200);
+        }).catch(() => {
+          geographicalPositionFn({
+            lng,
+            lat,
+            address: `${Number(lat).toFixed(6)}\u3001${Number(lng).toFixed(6)}`,
+            name: `${Number(lat).toFixed(6)}\u3001${Number(lng).toFixed(6)}`
+          });
+          resolve(200);
         });
       });
     }
@@ -210,7 +208,7 @@ const _sfc_main = {
       });
       emits("complete");
     }
-    function setMarker({ lat, lng }) {
+    async function setMarker({ lat, lng }, getAddress = false) {
       if (marker) {
         marker.setLatLng({ lat, lng });
         map.setView({ lat, lng }, mapConfig.maxZoom || 18);
@@ -231,6 +229,10 @@ const _sfc_main = {
         marker.addTo(map);
         map.setView({ lat, lng }, mapConfig.maxZoom || 18);
       }
+      if (getAddress) {
+        await throughCoordinatePosition(lng, lat);
+      }
+      return 200;
     }
     function clearMarker() {
       if (marker) {
@@ -338,9 +340,7 @@ const _sfc_main = {
             createElementVNode(
               "div",
               {
-                class: normalizeClass(["z-20 cursor-pointer absolute rounded top-2 right-2 w-[110px] h-8 border bg-background/70 text-xs flex items-center justify-center gap-1", [
-                  __props.allMapSelect ? "border-theme text-theme" : "border-border/50 text-main"
-                ]]),
+                class: normalizeClass(["z-20 cursor-pointer absolute rounded top-2 right-2 w-[110px] h-8 border bg-background/70 text-xs flex items-center justify-center gap-1", [__props.allMapSelect ? "border-theme text-theme" : "border-border/50 text-main"]]),
                 onClick: withModifiers(setMapSize, ["stop"])
               },
               [