hy-dispatch-ui-v3 0.2.33 → 0.2.35

package/lib/components/hyDialog/dialog.vue.js

@@ -23,7 +23,17 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       default: "default"
       // default-默认类型 right-右侧弹窗 fullscreen-全屏
     },
+    dialogClass: {
+      type: String,
+      default: "default"
+    },
+    // zIndex: {
+    //   type: Number,
+    //   default: null, // default-默认类型 right-右侧弹窗 fullscreen-全屏
+    // },
     top: String,
+    // 支持缩小化
+    showShrink: { type: Boolean, default: false },
     showOperate: { type: Boolean, default: true },
     showClose: { type: Boolean, default: true },
     showCancel: {
@@ -45,6 +55,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: String,
       default: "primary"
     },
+    width: {
+      type: String,
+      default: () => {
+        return "1000px";
+      }
+    },
     submitText: {
       type: String
     },
@@ -55,37 +71,17 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     "modelValue": { type: Boolean, default: false },
     "modelModifiers": {}
   }),
-  emits: /* @__PURE__ */ vue.mergeModels(["hide"], ["update:modelValue"]),
+  emits: /* @__PURE__ */ vue.mergeModels(["onMinimized", "onDialogMousedown"], ["update:modelValue"]),
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emits = __emit;
     const { t } = useLocale.useLocale();
     const visible = vue.useModel(__props, "modelValue");
     const loading = vue.ref(false);
-    const dialogClass = vue.computed(() => {
-      if (["right", "fullscreen"].includes(props.dialogType)) {
-        let value = "h-[calc(100vh-32px)] flex flex-col !my-4 !mr-4";
-        if (props.dialogType === "right") {
-          value += " !ml-auto";
-        } else {
-          value += " !ml-4";
-        }
-        return value;
-      }
-      return "flex flex-col";
-    });
-    const width = vue.computed(() => {
-      if (props.dialogType === "fullscreen") {
-        return "calc(100vw-32px)";
-      }
-      return "37.5rem";
-    });
-    const top = vue.computed(() => {
-      if (["right", "fullscreen"].includes(props.dialogType)) {
-        return "16px";
-      }
-      return props.top;
-    });
+    const dragLevelIndex = vue.ref(null);
+    const minimized = vue.ref(false);
+    const animating = vue.ref(false);
+    let animTimer = null;
     async function onSubmitHandler() {
       if (loading.value) return;
       loading.value = true;
@@ -100,7 +96,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       }
       visible.value = false;
       loading.value = false;
-      emits("hide");
     }
     async function onCancelHandler() {
       if (loading.value) return;
@@ -116,7 +111,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       }
       visible.value = false;
       loading.value = false;
-      emits("hide");
     }
     async function onCloseHandler() {
       if (loading.value) return;
@@ -132,127 +126,172 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       }
       visible.value = false;
       loading.value = false;
-      emits("hide");
     }
-    __expose({});
+    function runAnim(onEnd) {
+      animating.value = true;
+      clearTimeout(animTimer);
+      animTimer = setTimeout(() => {
+        animating.value = false;
+        onEnd?.();
+      }, 750);
+    }
+    function showToWorkspace(initDragLevelIndex) {
+      dragLevelIndex.value = initDragLevelIndex;
+      if (minimized.value) runAnim();
+      minimized.value = false;
+      emits("onMinimized", minimized.value);
+    }
+    function hideToWorkspace() {
+      runAnim(() => {
+        dragLevelIndex.value = 1;
+      });
+      minimized.value = true;
+      emits("onMinimized", minimized.value);
+    }
+    const dialogTestRef = vue.ref();
+    function dialogMousedown(e) {
+      emits("onDialogMousedown", e);
+    }
+    __expose({
+      showToWorkspace,
+      hideToWorkspace
+    });
     return (_ctx, _cache) => {
-      return vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElDialog), vue.mergeProps({
-        modelValue: visible.value,
-        "onUpdate:modelValue": ($event) => visible.value = $event,
-        width: width.value,
-        "append-to-body": true,
-        "close-on-click-modal": false,
-        "close-on-press-escape": false,
-        "show-close": false,
-        overflow: false,
-        top: top.value,
-        modal: false,
-        "modal-penetrable": "",
-        draggable: "",
-        class: dialogClass.value,
-        "align-center": !["right", "fullscreen"].includes(props.dialogType),
-        "body-class": "h-0 flex-1"
-      }, _ctx.$attrs), {
-        header: vue.withCtx(() => [
-          vue.createElementVNode(
-            "div",
-            {
-              class: vue.normalizeClass(["box-border w-full border-0 border-b border-solid border-background-3 px-4 py-[10px] text-main text-sm font-bold flex justify-between items-center relative", { "!justify-center": __props.titleAlign === "center" }])
+      return vue.openBlock(), vue.createElementBlock(
+        vue.Fragment,
+        null,
+        [
+          vue.createCommentVNode("  @mousedown.stop"),
+          vue.createCommentVNode('  :z-index="zIndex || dragLevelIndex"'),
+          vue.createCommentVNode("  draggable"),
+          vue.createCommentVNode(`  :align-center="!['right', 'fullscreen'].includes(props.dialogType)"`),
+          vue.createCommentVNode('  body-class="h-0 flex-1"'),
+          vue.createCommentVNode('  :class="dialogClass"'),
+          vue.createCommentVNode('  :overflow="false"'),
+          vue.createCommentVNode('  :modal="false"'),
+          vue.createVNode(vue.unref(elementPlus.ElDialog), vue.mergeProps({
+            ref_key: "dialogTestRef",
+            ref: dialogTestRef,
+            onMousedown: dialogMousedown,
+            "append-to-body": true,
+            "close-on-click-modal": false,
+            "close-on-press-escape": false,
+            "show-close": false,
+            "modal-penetrable": "",
+            "modal-class": {
+              "hy-dialog-app-shrink": animating.value || minimized.value,
+              "hy-dialog-is-minimized": minimized.value
             },
-            [
+            modelValue: visible.value,
+            "onUpdate:modelValue": ($event) => visible.value = $event,
+            width: props.width,
+            top: __props.top
+          }, _ctx.$attrs), {
+            header: vue.withCtx(() => [
               vue.createElementVNode(
-                "span",
-                null,
-                vue.toDisplayString(__props.title),
-                1
-                /* TEXT */
-              ),
-              __props.showClose ? (vue.openBlock(), vue.createElementBlock(
                 "div",
                 {
-                  key: 0,
-                  class: vue.normalizeClass(["text-lg absolute right-4 cursor-pointer text-danger-2", { "cursor-not-allowed": loading.value }]),
-                  onClick: onCloseHandler
+                  class: vue.normalizeClass(["box-border w-full border-0 border-b border-solid border-background-3 px-4 py-[10px] text-main text-sm font-bold flex justify-between items-center relative", { "!justify-center": __props.titleAlign === "center" }])
                 },
                 [
-                  vue.createVNode(vue.unref(index$1.HyIcon), {
-                    "svg-name": "layout-dialog-close-v2",
-                    class: "!w-[20px] !h-[20px]"
-                  })
+                  vue.createElementVNode(
+                    "div",
+                    { class: "flex-grow w-0 mr-2 over_one_line" },
+                    vue.toDisplayString(__props.title),
+                    1
+                    /* TEXT */
+                  ),
+                  vue.createElementVNode("div", { class: "text-lg cursor-pointer" }, [
+                    vue.renderSlot(_ctx.$slots, "title-operate-box"),
+                    __props.showShrink ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.HyIcon), {
+                      key: 0,
+                      onClick: hideToWorkspace,
+                      "svg-name": "layout-dialog-narrow",
+                      class: "!w-[20px] !h-[20px] ml-2 clickBox"
+                    })) : vue.createCommentVNode("v-if", true),
+                    __props.showClose ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.HyIcon), {
+                      key: 1,
+                      onClick: onCloseHandler,
+                      "svg-name": "layout-dialog-close-v2",
+                      class: vue.normalizeClass([{ "cursor-not-allowed": loading.value }, "!w-[20px] !h-[20px] ml-2 text-danger-2"])
+                    }, null, 8, ["class"])) : vue.createCommentVNode("v-if", true)
+                  ])
                 ],
                 2
                 /* CLASS */
-              )) : vue.createCommentVNode("v-if", true)
-            ],
-            2
-            /* CLASS */
-          )
-        ]),
-        default: vue.withCtx(() => [
-          vue.createElementVNode(
-            "div",
-            {
-              class: vue.normalizeClass(["max-h-full flex flex-col text-main", { "h-full": ["right", "fullscreen"].includes(props.dialogType) }])
-            },
-            [
-              vue.renderSlot(_ctx.$slots, "content", {}, () => [
-                vue.createElementVNode("div", { class: "scroll-body overflow-auto h-0 flex-1 px-6 py-4" }, [
-                  vue.renderSlot(_ctx.$slots, "default")
-                ])
-              ]),
-              __props.showOperate ? (vue.openBlock(), vue.createElementBlock("div", {
-                key: 0,
-                class: "flex items-center flex-row-reverse justify-between p-5 pr-[26px] bg-[rgba(var(--hy-background-2),0.5)] mt-auto"
-              }, [
-                vue.renderSlot(_ctx.$slots, "operate-left-box"),
-                vue.createElementVNode("div", { class: "flex items-center" }, [
-                  vue.renderSlot(_ctx.$slots, "operate", {}, () => [
-                    __props.showCancel ? (vue.openBlock(), vue.createBlock(vue.unref(index.HyButton), {
-                      key: 0,
-                      type: __props.cancelType,
-                      disabled: loading.value,
-                      class: "!min-w-[120px]",
-                      onClick: onCancelHandler
-                    }, {
-                      default: vue.withCtx(() => [
-                        vue.createTextVNode(
-                          vue.toDisplayString(vue.unref(t)("dialog.cancel")),
-                          1
-                          /* TEXT */
-                        )
-                      ]),
-                      _: 1
-                      /* STABLE */
-                    }, 8, ["type", "disabled"])) : vue.createCommentVNode("v-if", true),
-                    __props.showSubmit ? (vue.openBlock(), vue.createBlock(vue.unref(index.HyButton), {
-                      key: 1,
-                      type: __props.submitType,
-                      disabled: loading.value,
-                      class: "!min-w-[120px]",
-                      onClick: onSubmitHandler
-                    }, {
-                      default: vue.withCtx(() => [
-                        vue.createTextVNode(
-                          vue.toDisplayString(vue.unref(t)("dialog.confirm")),
-                          1
-                          /* TEXT */
-                        )
-                      ]),
-                      _: 1
-                      /* STABLE */
-                    }, 8, ["type", "disabled"])) : vue.createCommentVNode("v-if", true)
+              )
+            ]),
+            default: vue.withCtx(() => [
+              vue.createElementVNode(
+                "div",
+                {
+                  class: vue.normalizeClass(["max-h-full flex flex-col text-main", { "h-full": ["right", "fullscreen"].includes(props.dialogType) }])
+                },
+                [
+                  vue.renderSlot(_ctx.$slots, "content", {}, () => [
+                    vue.createElementVNode("div", { class: "scroll-body overflow-auto h-0 flex-1 px-6 py-4" }, [
+                      vue.renderSlot(_ctx.$slots, "default")
+                    ])
                   ]),
-                  vue.renderSlot(_ctx.$slots, "operate-right-box")
-                ])
-              ])) : vue.createCommentVNode("v-if", true)
-            ],
-            2
-            /* CLASS */
-          )
-        ]),
-        _: 3
-        /* FORWARDED */
-      }, 16, ["modelValue", "onUpdate:modelValue", "width", "top", "class", "align-center"]);
+                  __props.showOperate ? (vue.openBlock(), vue.createElementBlock("div", {
+                    key: 0,
+                    class: "flex items-center flex-row-reverse justify-between p-5 pr-[26px] mt-auto"
+                  }, [
+                    vue.renderSlot(_ctx.$slots, "operate-left-box"),
+                    vue.createElementVNode("div", { class: "flex items-center" }, [
+                      vue.renderSlot(_ctx.$slots, "operate", {}, () => [
+                        __props.showCancel ? (vue.openBlock(), vue.createBlock(vue.unref(index.HyButton), {
+                          key: 0,
+                          type: __props.cancelType,
+                          disabled: loading.value,
+                          class: "!min-w-[120px]",
+                          onMousedown: vue.withModifiers(() => {
+                          }, ["stop"]),
+                          onClick: onCancelHandler
+                        }, {
+                          default: vue.withCtx(() => [
+                            vue.createTextVNode(
+                              vue.toDisplayString(vue.unref(t)("dialog.cancel")),
+                              1
+                              /* TEXT */
+                            )
+                          ]),
+                          _: 1
+                          /* STABLE */
+                        }, 8, ["type", "disabled", "onMousedown"])) : vue.createCommentVNode("v-if", true),
+                        __props.showSubmit ? (vue.openBlock(), vue.createBlock(vue.unref(index.HyButton), {
+                          key: 1,
+                          type: __props.submitType,
+                          disabled: loading.value,
+                          class: "!min-w-[120px]",
+                          onClick: onSubmitHandler
+                        }, {
+                          default: vue.withCtx(() => [
+                            vue.createTextVNode(
+                              vue.toDisplayString(vue.unref(t)("dialog.confirm")),
+                              1
+                              /* TEXT */
+                            )
+                          ]),
+                          _: 1
+                          /* STABLE */
+                        }, 8, ["type", "disabled"])) : vue.createCommentVNode("v-if", true)
+                      ]),
+                      vue.renderSlot(_ctx.$slots, "operate-right-box")
+                    ])
+                  ])) : vue.createCommentVNode("v-if", true)
+                ],
+                2
+                /* CLASS */
+              )
+            ]),
+            _: 3
+            /* FORWARDED */
+          }, 16, ["modal-class", "modelValue", "onUpdate:modelValue", "width", "top"])
+        ],
+        2112
+        /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
+      );
     };
   }
 });

package/lib/components/hyDialog/style/dialog.scss

@@ -0,0 +1,13 @@
+.hy-dialog-app-shrink {
+  transform-origin: 100% 100%;
+  transition:
+          transform 0.7s cubic-bezier(0.65, 0, 0.35, 1),
+          opacity 0.7s ease;
+  will-change: transform, opacity;
+  &.hy-dialog-is-minimized {
+    transform: translate(calc(50vw - 100%), calc(100vh - 0px - 100%))
+    scale(0.01) !important;
+    opacity: 0.95;
+    pointer-events: none;
+  }
+}

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

@@ -6,14 +6,14 @@ var vue = require('vue');
 var elementPlus = require('element-plus');
 var iconsVue = require('@element-plus/icons-vue');
 var index = require('../js/index.js');
+var is = require('../../../utils/is.js');
 var form = require('../../../utils/form.js');
+var handler = require('../../../utils/handler.js');
 var index$1 = require('../../hyTooltip/index.js');
 var index$2 = require('../../hyInput/index.js');
 var index$3 = require('../../hyDatePicker/index.js');
 var index$4 = require('../../hyTimePicker/index.js');
 var index$5 = require('../../hyOrgCascader/index.js');
-var is = require('../../../utils/is.js');
-var handler = require('../../../utils/handler.js');
 
 const _sfc_main = {
   __name: "formItem",
@@ -162,11 +162,10 @@ const _sfc_main = {
             [
               vue.createCommentVNode(" \u81EA\u5B9A\u4E49\u5177\u540D\u63D2\u69FD "),
               __props.column.slot && _ctx.$slots[__props.column.slot] ? vue.renderSlot(_ctx.$slots, __props.column.slot, {
-                key: 0,
                 column: __props.column,
                 model: __props.model,
                 required: vue.unref(index.isRequired)(props, __props.column)
-              }) : __props.column.type === "input" ? (vue.openBlock(), vue.createElementBlock(
+              }, void 0, void 0, 0) : __props.column.type === "input" ? (vue.openBlock(), vue.createElementBlock(
                 vue.Fragment,
                 { key: 1 },
                 [

package/lib/components/hyForm/js/useAppForm.js

@@ -1,9 +1,9 @@
 'use strict';
 
 var vue = require('vue');
-var form = require('../../../utils/form.js');
 var handler = require('../../../utils/handler.js');
 var is = require('../../../utils/is.js');
+var form = require('../../../utils/form.js');
 var useLocale = require('../../../hooks/useLocale.js');
 
 const genDefaultLabel = (config) => {

package/lib/components/hyForm/style/form.scss

@@ -1,10 +1,6 @@
 .hy-form-container {
   display: grid;
   column-gap: 24px;
-  .el-form-item__label::before {
-    content: '' !important;
-    display: none;
-  }
 
   .label-required {
     &::after {

package/lib/components/hyNoPermissions/noPermissions.vue.js

@@ -15,7 +15,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
   props: {
     svgName: {
       type: String,
-      default: "ops-list-no-data"
+      default: "analytics-v3-no-data-normal"
     }
   },
   emits: [],

package/lib/components/hyNoPermissionsMap/noPermissionsMap.vue.js

@@ -15,7 +15,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
   props: {
     svgName: {
       type: String,
-      default: "ops-list-no-data"
+      default: "analytics-v3-no-data-normal"
     }
   },
   emits: [],

package/lib/components/hyOrgCascader/orgCascader.vue.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var vue = require('vue');
 var elementPlus = require('element-plus');
-var useLocale = require('../../hooks/useLocale.js');
 var useApi = require('../../hooks/useApi.js');
+var useLocale = require('../../hooks/useLocale.js');
 
 import "./style/orgCascader.scss";
 

package/lib/components/hySearch/cpns/searchItem.vue.js

@@ -79,7 +79,7 @@ const _sfc_main = {
         prop: columnProp.value
       }, {
         default: vue.withCtx(() => [
-          vue.createElementVNode("div", { class: "flex bg-background-2 rounded border border-transparent hover:border-theme box-border" }, [
+          vue.createElementVNode("div", { class: "flex bg-background-2 rounded outline outline-1 outline-transparent outline-offset-0 hover:outline-theme box-border" }, [
             vue.createElementVNode(
               "div",
               {
@@ -96,10 +96,7 @@ const _sfc_main = {
                     }])
                   },
                   [
-                    __props.column.labelSlot && _ctx.$slots[__props.column.labelSlot] ? vue.renderSlot(_ctx.$slots, __props.column.labelSlot, {
-                      key: 0,
-                      column: __props.column
-                    }) : (vue.openBlock(), vue.createElementBlock(
+                    __props.column.labelSlot && _ctx.$slots[__props.column.labelSlot] ? vue.renderSlot(_ctx.$slots, __props.column.labelSlot, { column: __props.column }, void 0, void 0, 0) : (vue.openBlock(), vue.createElementBlock(
                       "span",
                       { key: 1 },
                       vue.toDisplayString(__props.column.label),
@@ -119,10 +116,7 @@ const _sfc_main = {
                   },
                   [
                     vue.createCommentVNode(" \u81EA\u5B9A\u4E49\u5177\u540D\u63D2\u69FD "),
-                    __props.column.slot ? vue.renderSlot(_ctx.$slots, __props.column.slot, {
-                      key: 0,
-                      column: __props.column
-                    }) : __props.column.type === "input" ? (vue.openBlock(), vue.createElementBlock(
+                    __props.column.slot ? vue.renderSlot(_ctx.$slots, __props.column.slot, { column: __props.column }, void 0, void 0, 0) : __props.column.type === "input" ? (vue.openBlock(), vue.createElementBlock(
                       vue.Fragment,
                       { key: 1 },
                       [

package/lib/components/hySearch/js/index.js

@@ -57,13 +57,13 @@ function useShrink(props, formItemWrapper) {
   function getContainerPickUpHeight() {
     switch (props.size) {
       case "large":
-        return 43;
+        return 44;
       case "small":
-        return 27;
+        return 28;
       case "":
       case "default":
       default:
-        return 35;
+        return 36;
     }
   }
   function switchShrink() {
@@ -76,7 +76,7 @@ function useShrink(props, formItemWrapper) {
     if (container.children.length) {
       for (let i = 0; i < container.children.length; i++) {
         const element = container.children[i];
-        if (i > 0 && element.offsetLeft === 0) {
+        if (i > 0 && element.offsetLeft <= 1) {
           showShrink.value = true;
           break;
         } else if (i === container.children.length - 1) {

package/lib/components/hySearch/style/search.scss

@@ -33,6 +33,7 @@
     flex-wrap: wrap;
     gap: 16px;
     position: relative;
+    padding: 1px;
     .hy-el-form-item {
       margin-bottom: 0;
       &.hidden {