hy-dispatch-ui-v3 0.1.1 → 0.1.3

package/dist/tailwind.css

@@ -680,6 +680,10 @@ video {
   margin-top: 10px;
 }
 
+.mt-\[12px\] {
+  margin-top: 12px;
+}
+
 .box-border {
   box-sizing: border-box;
 }
@@ -712,12 +716,12 @@ video {
   height: 0.75rem !important;
 }
 
-.h-0 {
-  height: 0px;
+.\!h-\[46px\] {
+  height: 46px !important;
 }
 
-.h-\[253px\] {
-  height: 253px;
+.h-0 {
+  height: 0px;
 }
 
 .h-\[364px\] {
@@ -752,6 +756,10 @@ video {
   width: 0.75rem !important;
 }
 
+.\!w-\[46px\] {
+  width: 46px !important;
+}
+
 .w-0 {
   width: 0px;
 }
@@ -760,8 +768,8 @@ video {
   width: 1.25rem;
 }
 
-.w-\[124px\] {
-  width: 124px;
+.w-\[160px\] {
+  width: 160px;
 }
 
 .w-\[200px\] {
@@ -953,11 +961,25 @@ video {
   background-color: rgb(var(--hy-background), var(--tw-bg-opacity, 1)) !important;
 }
 
+.bg-\[rgba\(var\(--hy-theme\)\2c 0\.2\)\] {
+  background-color: rgba(var(--hy-theme),0.2);
+}
+
 .bg-background-2 {
   --tw-bg-opacity: 1;
   background-color: rgb(var(--hy-background-2), var(--tw-bg-opacity, 1));
 }
 
+.bg-info {
+  --tw-bg-opacity: 1;
+  background-color: rgb(var(--hy-info), var(--tw-bg-opacity, 1));
+}
+
+.bg-success {
+  --tw-bg-opacity: 1;
+  background-color: rgb(var(--hy-success), var(--tw-bg-opacity, 1));
+}
+
 .bg-success\/50 {
   background-color: rgb(var(--hy-success), 0.5);
 }
@@ -1064,6 +1086,10 @@ video {
   padding-top: 11px;
 }
 
+.pt-\[32px\] {
+  padding-top: 32px;
+}
+
 .pt-\[37px\] {
   padding-top: 37px;
 }
@@ -1072,6 +1098,10 @@ video {
   padding-top: 5px;
 }
 
+.text-center {
+  text-align: center;
+}
+
 .text-base {
   font-size: 1rem;
   line-height: 1.5rem;
@@ -1087,6 +1117,10 @@ video {
   line-height: 1rem;
 }
 
+.font-\[600\] {
+  font-weight: 600;
+}
+
 .font-bold {
   font-weight: 700;
 }
@@ -1108,6 +1142,11 @@ video {
   color: rgb(var(--hy-auxiliary), var(--tw-text-opacity, 1));
 }
 
+.text-danger {
+  --tw-text-opacity: 1;
+  color: rgb(var(--hy-danger), var(--tw-text-opacity, 1));
+}
+
 .text-danger-2 {
   --tw-text-opacity: 1;
   color: rgb(var(--hy-danger-2), var(--tw-text-opacity, 1));
@@ -1133,6 +1172,17 @@ video {
   color: rgb(var(--hy-warning), var(--tw-text-opacity, 1));
 }
 
+.shadow-\[0_0_4px_0\] {
+  --tw-shadow: 0 0 4px 0;
+  --tw-shadow-colored: 0 0 4px 0 var(--tw-shadow-color);
+  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
+}
+
+.shadow-success {
+  --tw-shadow-color: rgb(var(--hy-success), 1);
+  --tw-shadow: var(--tw-shadow-colored);
+}
+
 .outline {
   outline-style: solid;
 }

package/es/components/appButton/appButton.vue.mjs

@@ -1,7 +1,7 @@
 import { openBlock, createElementBlock, normalizeClass, createCommentVNode, createElementVNode, renderSlot, createBlock, unref, withCtx, createVNode, Fragment } from 'vue';
 import { ElIcon } from 'element-plus';
 import { Loading, ArrowDown } from '@element-plus/icons-vue';
-import _sfc_main$1 from '../appIcon/appIcon.vue.mjs';
+import { AppIcon } from '../appIcon/index.mjs';
 
 import "./style/appButton.scss";
 
@@ -38,10 +38,10 @@ const _sfc_main = {
   setup(__props, { emit: __emit }) {
     const props = __props;
     const typeObj = {
-      default: "button_default",
-      primary: "button_function",
-      success: "button_addTo",
-      danger: "button_delete"
+      default: "hy-button_default",
+      primary: "hy-button_function",
+      success: "hy-button_addTo",
+      danger: "hy-button_delete"
     };
     const emit = __emit;
     const handleClick = (event) => {
@@ -80,7 +80,7 @@ const _sfc_main = {
                   },
                   [
                     !__props.loading ? renderSlot(_ctx.$slots, "svg", { key: 0 }, () => [
-                      __props.svgName ? (openBlock(), createBlock(_sfc_main$1, {
+                      __props.svgName ? (openBlock(), createBlock(unref(AppIcon), {
                         key: 0,
                         "svg-name": __props.svgName,
                         "class-name": "!w-3 !h-3 text-main mr-2"

package/es/components/appButton/style/appButton.scss

@@ -32,7 +32,7 @@
   }
 }
 
-.button_default {
+.hy-button_default {
   background: rgba(94, 157, 180, 0.32);
 
   .hy-button__border {
@@ -96,7 +96,7 @@
   }
 }
 
-.button_function {
+.hy-button_function {
   background: rgba(45, 242, 255, 0.32);
 
   .hy-button__border {
@@ -160,7 +160,7 @@
   }
 }
 
-.button_addTo {
+.hy-button_addTo {
   background: rgba(44, 232, 152, 0.32);
 
   .hy-button__border {
@@ -224,7 +224,7 @@
   }
 }
 
-.button_delete {
+.hy-button_delete {
   background: rgba(255, 77, 77, 0.32);
 
   .hy-button__border {

package/es/components/appConfigProvider/appConfigProvider.vue.mjs

@@ -10,45 +10,61 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
   props: {
     locale: {
       type: String,
+      required: false,
       default: "zhCn"
     },
     api: {
-      type: Object
+      type: [Object, Function],
+      required: false
+    },
+    userAvatarMap: {
+      type: Map,
+      required: false,
+      default: () => /* @__PURE__ */ new Map()
     },
     size: {
       type: String,
+      required: false,
       default: "default"
     },
     zIndex: {
-      type: Number
+      type: Number,
+      required: false
     },
     button: {
-      type: Object
+      type: Object,
+      required: false
     },
     link: {
-      type: Object
+      type: Object,
+      required: false
     },
     dialog: {
-      type: Object
+      type: Object,
+      required: false
     },
     message: {
-      type: Object
+      type: Object,
+      required: false
     },
     emptyValues: {
-      type: String
+      type: String,
+      required: false
     },
     valueOnClear: {
-      type: [String, Number, null]
+      type: [String, Number, null],
+      required: false
     },
     table: {
-      type: Object
+      type: Object,
+      required: false
     }
   },
   setup(__props) {
     const props = __props;
     const globalConfig = provideGlobalConfig(props);
     const config = computed(() => {
-      const { locale, api, ...config2 } = globalConfig.value;
+      const { locale, api, userAvatarMap, ...config2 } = globalConfig.value;
       return {
         locale: ElementLocale[locale] || ElementLocale["zhCn"],
         ...config2

package/es/components/appConfirmDialog/appConfirmDialog.vue.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, useModel, ref, openBlock, createBlock, unref, mergeProps, withCtx, createElementVNode, createVNode, normalizeClass, toDisplayString, createElementBlock, createTextVNode, createCommentVNode, mergeModels } from 'vue';
+import { defineComponent, useModel, ref, openBlock, createBlock, unref, mergeProps, withCtx, createElementVNode, createVNode, normalizeClass, toDisplayString, createElementBlock, createTextVNode, createCommentVNode, withModifiers, mergeModels } from 'vue';
 import { ElDialog, ElIcon } from 'element-plus';
 import { Warning, CircleClose } from '@element-plus/icons-vue';
 import { AppButton } from '../appButton/index.mjs';
@@ -27,7 +27,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     },
     showClose: {
       type: Boolean,
-      default: true
+      default: false
     },
     showCancel: {
       type: Boolean,
@@ -51,19 +51,21 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     submitText: {
       type: String
     },
-    onCancel: {
-      type: Function
+    iconColor: {
+      type: String,
+      default: "rgb(var(--hy-main))"
     },
-    onSubmit: {
-      type: Function
-    }
+    onClose: Function,
+    onCancel: Function,
+    onSubmit: Function
   }, {
     "modelValue": { type: Boolean, default: false },
     "modelModifiers": {}
   }),
-  emits: /* @__PURE__ */ mergeModels(["on-submit", "on-close"], ["update:modelValue"]),
+  emits: /* @__PURE__ */ mergeModels(["hide"], ["update:modelValue"]),
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
+    const emits = __emit;
     const { t } = useLocale();
     const visible = useModel(__props, "modelValue");
     const loading = ref(false);
@@ -81,8 +83,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       }
       visible.value = false;
       loading.value = false;
+      emits("hide");
     }
-    async function onCloseHandler() {
+    async function onCancelHandler() {
       if (loading.value) return;
       loading.value = true;
       if (props.onCancel) {
@@ -96,6 +99,23 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       }
       visible.value = false;
       loading.value = false;
+      emits("hide");
+    }
+    async function onCloseHandler() {
+      if (loading.value) return;
+      loading.value = true;
+      if (props.onClose) {
+        try {
+          await props.onClose();
+        } catch (err) {
+          console.error(err);
+          loading.value = false;
+          return;
+        }
+      }
+      visible.value = false;
+      loading.value = false;
+      emits("hide");
     }
     __expose({
       show: () => {
@@ -117,7 +137,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         top: "15%"
       }, _ctx.$attrs), {
         header: withCtx(() => [
-          createElementVNode("div", { class: "h-[38px] flex items-center justify-between border-b border-border pl-4 pr-[10px]" }, [
+          createElementVNode("div", {
+            class: "h-[38px] flex items-center justify-between border-b border-border pl-4 pr-[10px]",
+            onClick: withModifiers(() => {
+            }, ["stop"])
+          }, [
             createElementVNode(
               "span",
               { class: "text-sm text-main font-bold" },
@@ -147,44 +171,44 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
               2
               /* CLASS */
             )) : createCommentVNode("v-if", true)
-          ])
+          ], 8, ["onClick"])
         ]),
         default: withCtx(() => [
-          createElementVNode("div", { class: "h-[253px] flex flex-col items-center justify-between pt-[37px] pb-[27px]" }, [
+          createElementVNode("div", { class: "flex flex-col items-center justify-between pt-[37px] pb-[27px]" }, [
             createElementVNode("div", { class: "flex flex-col items-center text-main" }, [
               createVNode(unref(ElIcon), {
                 size: "40",
-                color: "rgb(var(--hy-main))"
+                color: __props.iconColor
               }, {
                 default: withCtx(() => [
                   createVNode(unref(Warning))
                 ]),
                 _: 1
                 /* STABLE */
-              }),
+              }, 8, ["color"]),
               createElementVNode(
                 "div",
                 {
-                  class: normalizeClass(["text-base font-bold mt-[10px] mb-[26px]", __props.titleClass])
+                  class: normalizeClass(["text-base text-center font-bold mt-[10px] mb-[26px]", __props.titleClass])
                 },
                 toDisplayString(__props.title),
                 3
                 /* TEXT, CLASS */
               ),
               createElementVNode("div", {
-                class: "max-w-[300px] text-smword-break",
+                class: "max-w-[300px] text-smword-break text-center break-all",
                 innerHTML: __props.content
               }, null, 8, ["innerHTML"])
             ]),
             __props.showSubmit || __props.showCancel ? (openBlock(), createElementBlock("div", {
               key: 0,
-              class: "mt-3"
+              class: "pt-[32px]"
             }, [
               __props.showCancel ? (openBlock(), createBlock(unref(AppButton), {
                 key: 0,
                 type: __props.cancelType,
                 disabled: loading.value,
-                onClick: onCloseHandler
+                onClick: onCancelHandler
               }, {
                 default: withCtx(() => [
                   createTextVNode(

package/es/components/appConfirmDialog/appConfirmMethod.mjs

@@ -1,4 +1,5 @@
-import { createVNode, unref, render } from 'vue';
+import { unref, createVNode, render } from 'vue';
+import { defaultAxios } from '../../hooks/useApi.mjs';
 import { AppConfigProvider } from '../appConfigProvider/index.mjs';
 import _sfc_main from './appConfirmDialog.vue.mjs';
 import { useGlobalConfig } from '../../hooks/useGlobalConfig.mjs';
@@ -8,22 +9,25 @@ function appConfirmMethod(config) {
   let container = document.createDocumentFragment();
   const currentConfig = {
     ...config,
-    onClose: () => {
-      if (config.onClose) {
-        config.onClose();
-      }
+    onHide: () => {
       destroy();
     }
   };
   let confirmDialogInstance = null;
   function render$1(props) {
     const globalConfig = useGlobalConfig();
+    const {
+      locale = "zhCn",
+      api = defaultAxios,
+      ...args
+    } = unref(globalConfig) || {};
     const vm = createVNode(_sfc_main, props);
     const configProvider = createVNode(
       AppConfigProvider,
       {
-        locale: unref(globalConfig).locale,
-        api: unref(globalConfig).api
+        locale,
+        api,
+        ...args
       },
       () => [vm]
     );
@@ -48,10 +52,10 @@ function appConfirmMethod(config) {
 _sfc_main.tip = (props) => {
   const { t } = useLocale();
   return appConfirmMethod({
-    showCancel: false,
     dialogTitle: t("confirmDialog.prompt"),
     title: t("confirmDialog.prompt"),
     content: t("confirmDialog.content"),
+    showCancel: false,
     ...props
   });
 };
@@ -71,6 +75,7 @@ _sfc_main.warning = (props) => {
     title: t("confirmDialog.prompt"),
     titleClass: "text-warning",
     content: t("confirmDialog.content"),
+    iconColor: "rgb(var(--hy-warning))",
     ...props
   });
 };
@@ -78,10 +83,11 @@ _sfc_main.danger = (props) => {
   const { t } = useLocale();
   return appConfirmMethod({
     dialogTitle: t("confirmDialog.dangerousOperation"),
-    titleClass: "text-danger-2",
+    titleClass: "text-danger",
     title: t("confirmDialog.prompt"),
     content: t("confirmDialog.content"),
     submitType: "danger",
+    iconColor: "rgb(var(--hy-danger))",
     ...props
   });
 };

package/es/components/appForm/appForm.vue.mjs

@@ -1,7 +1,8 @@
 import { defineComponent, useTemplateRef, computed, nextTick, unref, openBlock, createBlock, mergeProps, withCtx, createElementVNode, normalizeStyle, createCommentVNode, createElementBlock, Fragment, renderList, renderSlot, toDisplayString, createVNode, createTextVNode } from 'vue';
 import { ElForm, ElFormItem, ElPopover, ElInput, ElSelect, ElRadioGroup, ElCheckboxGroup } from 'element-plus';
 import { AppIcon } from '../appIcon/index.mjs';
-import _sfc_main$1 from '../appDatePicker/appDatePicker.vue.mjs';
+import { AppDatePicker } from '../appDatePicker/index.mjs';
+import { AppOrgCascader } from '../appOrgCascader/index.mjs';
 import { columnShowHandler, columnItemStyle, isRequired, renderText, isDisabled } from './js/index.mjs';
 import { resetAppFormValue } from './js/useAppForm.mjs';
 import { useLocale } from '../../hooks/useLocale.mjs';
@@ -247,7 +248,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                       "daterange",
                                       "monthrange",
                                       "yearrange"
-                                    ].includes((_a = column.attrs) == null ? void 0 : _a.type) && unref(isArray)(column.field) ? (openBlock(), createBlock(_sfc_main$1, mergeProps({
+                                    ].includes((_a = column.attrs) == null ? void 0 : _a.type) && unref(isArray)(column.field) ? (openBlock(), createBlock(unref(AppDatePicker), mergeProps({
                                       key: 0,
                                       start: __props.model[column.field[0]],
                                       "onUpdate:start": ($event) => __props.model[column.field[0]] = $event,
@@ -257,7 +258,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                       style: { "width": "100%" }
                                     }, { ref_for: true }, column.attrs, {
                                       disabled: unref(isDisabled)(props, column)
-                                    }), null, 16, ["start", "onUpdate:start", "end", "onUpdate:end", "disabled"])) : (openBlock(), createBlock(_sfc_main$1, mergeProps({
+                                    }), null, 16, ["start", "onUpdate:start", "end", "onUpdate:end", "disabled"])) : (openBlock(), createBlock(unref(AppDatePicker), mergeProps({
                                       key: 1,
                                       modelValue: __props.model[column.field],
                                       "onUpdate:modelValue": ($event) => __props.model[column.field] = $event,
@@ -295,6 +296,19 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                   ],
                                   2112
                                   /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
+                                )) : column.type === "org-cascader" ? (openBlock(), createElementBlock(
+                                  Fragment,
+                                  { key: 6 },
+                                  [
+                                    createCommentVNode(" \u90E8\u95E8\u7EA7\u8054\u9009\u62E9\u6846 "),
+                                    createVNode(unref(AppOrgCascader), mergeProps({
+                                      modelValue: __props.model[column.field],
+                                      "onUpdate:modelValue": ($event) => __props.model[column.field] = $event,
+                                      disabled: unref(isDisabled)(props, column)
+                                    }, { ref_for: true }, column.attrs), null, 16, ["modelValue", "onUpdate:modelValue", "disabled"])
+                                  ],
+                                  2112
+                                  /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
                                 )) : createCommentVNode("v-if", true)
                               ],
                               64

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

@@ -4,6 +4,15 @@ import { getDefaultValueFormatByType } from '../../../utils/date.mjs';
 import { useLocale } from '../../../hooks/useLocale.mjs';
 import { isArray } from '../../../utils/is.mjs';
 
+const genDefaultLabel = (config) => {
+  if (config.label) return config.label;
+  const { t } = useLocale();
+  switch (config.type) {
+    // 部门级联选择框
+    case "org-cascader":
+      return t("form.department");
+  }
+};
 const genPlaceholderHandler = (config) => {
   const { t } = useLocale();
   const { type, label, attrs = {} } = config || {};
@@ -11,8 +20,10 @@ const genPlaceholderHandler = (config) => {
   switch (type) {
     case "input":
       placeholder = placeholder || t("hy.pleaseEnterPlaceholder", [label]);
+      break;
     case "select":
       placeholder = placeholder || t("hy.pleaseSelectPlaceholder", [label]);
+      break;
     case "date-picker":
       if (["datetimerange", "daterange", "monthrange", "yearrange"].includes(
         attrs == null ? void 0 : attrs.type
@@ -38,6 +49,7 @@ const genPlaceholderHandler = (config) => {
       } else {
         placeholder = placeholder || t("hy.pleaseSelectPlaceholder", [label]);
       }
+      break;
     default:
       placeholder = placeholder || label;
   }
@@ -72,13 +84,15 @@ const rulesHandler = (config) => {
   return rules;
 };
 function appFormItemHandler(column = {}) {
-  const { placeholder, startPlaceholder, endPlaceholder } = genPlaceholderHandler(column);
+  const label = genDefaultLabel(column);
+  const { placeholder, startPlaceholder, endPlaceholder } = genPlaceholderHandler({ ...column, label });
   const attrs = { ...column.attrs || {}, placeholder };
   column = mergeDeep(
     { ...column },
     {
       key: /* @__PURE__ */ Symbol("appFormItemKey"),
       field: column.prop,
+      label,
       readonly: column.readonly || false,
       rules: rulesHandler(column)
     }

package/es/components/appIcon/index.mjs

@@ -1,8 +1,6 @@
 import _sfc_main from './appIcon.vue.mjs';
-import _sfc_main$1 from './appIconBox.vue.mjs';
 import { withInstall } from '../../utils/handler.mjs';
 
 const AppIcon = withInstall(_sfc_main);
-const appIconBox = withInstall(_sfc_main$1);
 
-export { AppIcon, appIconBox, AppIcon as default };
+export { AppIcon, AppIcon as default };

package/es/components/appIcon/style/appIcon.scss

@@ -1,8 +1,8 @@
 .app-icon {
   width: 16px;
   height: 16px;
-  vertical-align: -0.15em;
-  stroke: currentColor;
+  vertical-align: -0.1em;
+  display: inline-block;
   overflow: hidden;
   fill: currentColor;
   outline: none;

package/es/components/{appIcon → appIconBox}/appIconBox.vue.mjs

@@ -1,11 +1,11 @@
 import { defineComponent, computed, openBlock, createElementBlock, createVNode, unref, createSlots, withCtx, createElementVNode, normalizeStyle, normalizeClass, renderSlot } from 'vue';
 import { ElTooltip } from 'element-plus';
-import _sfc_main$1 from './appIcon.vue.mjs';
+import { AppIcon } from '../appIcon/index.mjs';
 
 import "./style/appIconBox.scss";
 
 const __default__ = defineComponent({
-  name: "appIconBox"
+  name: "AppIconBox"
 });
 const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
   props: {
@@ -69,7 +69,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 style: normalizeStyle(style.value)
               },
               [
-                createVNode(_sfc_main$1, {
+                createVNode(unref(AppIcon), {
                   prefix: __props.prefix,
                   "svg-name": __props.svgName,
                   style: { width: "100%", height: "100%" }

package/es/components/appIconBox/index.mjs

@@ -0,0 +1,6 @@
+import _sfc_main from './appIconBox.vue.mjs';
+import { withInstall } from '../../utils/handler.mjs';
+
+const AppIconBox = withInstall(_sfc_main);
+
+export { AppIconBox, AppIconBox as default };