hy-dispatch-ui-v3 0.2.37 → 0.2.39

package/dist/tailwind.css

@@ -268,10 +268,6 @@
   margin-bottom: 0.375rem;
 }
 
-.\!ml-4 {
-  margin-left: 1rem !important;
-}
-
 .\!ml-auto {
   margin-left: auto !important;
 }
@@ -560,8 +556,8 @@
   height: 54px;
 }
 
-.h-\[calc\(100vh-32px\)\] {
-  height: calc(100vh - 32px);
+.h-\[97vh\] {
+  height: 97vh;
 }
 
 .h-full {

package/es/components/hyDialog/dialog.vue.mjs

@@ -1,4 +1,4 @@
-import { useModel, ref, computed, openBlock, createElementBlock, Fragment, createCommentVNode, createVNode, unref, mergeProps, withCtx, createElementVNode, normalizeClass, renderSlot, createBlock, withModifiers, createTextVNode, toDisplayString, mergeModels, defineComponent } from 'vue';
+import { useModel, ref, computed, openBlock, createElementBlock, Fragment, createCommentVNode, createVNode, unref, mergeProps, withCtx, createElementVNode, renderSlot, normalizeClass, createBlock, withModifiers, createTextVNode, toDisplayString, mergeModels, defineComponent } from 'vue';
 import { ElDialog } from 'element-plus';
 import { useLocale } from '../../hooks/useLocale.mjs';
 import { HyButton } from '../hyButton/index.mjs';
@@ -17,19 +17,17 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     dialogType: {
       type: String,
       default: "default"
-      // default-默认类型 right-右侧弹窗 fullscreen-全屏
+      // default-默认类型 right-右侧弹窗
     },
     dialogClass: {
       type: String,
       default: "default"
     },
-    // zIndex: {
-    //   type: Number,
-    //   default: null, // default-默认类型 right-右侧弹窗 fullscreen-全屏
-    // },
     top: String,
-    // 支持缩小化
-    showShrink: { type: Boolean, default: false },
+    // 是否可缩小化
+    ifShrink: { type: Boolean, default: false },
+    // 是否拖拽
+    ifDraggable: { type: Boolean, default: false },
     showOperate: { type: Boolean, default: true },
     showClose: { type: Boolean, default: true },
     showCancel: {
@@ -74,6 +72,15 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     const { t } = useLocale();
     const visible = useModel(__props, "modelValue");
     const loading = ref(false);
+    const dialogTypeRight = computed(() => {
+      return props.dialogType === "right";
+    });
+    const ifDraggable = computed(() => {
+      if (props.ifShrink) {
+        return true;
+      }
+      return props.ifDraggable;
+    });
     const dragLevelIndex = ref(null);
     const minimized = ref(false);
     const animating = ref(false);
@@ -167,15 +174,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         Fragment,
         null,
         [
-          createCommentVNode("  @mousedown.stop"),
-          createCommentVNode(`  :align-center="!['right', 'fullscreen'].includes(props.dialogType)"`),
-          createCommentVNode('  body-class="h-0 flex-1"'),
-          createCommentVNode('  :class="dialogClass"'),
+          createCommentVNode("  draggable	\u4E3A Dialog \u542F\u7528\u53EF\u62D6\u62FD\u529F\u80FD"),
+          createCommentVNode(" modal  \u662F\u5426\u9700\u8981\u906E\u7F69\u5C42"),
+          createCommentVNode(" overflow  \u62D6\u52A8\u8303\u56F4\u53EF\u4EE5\u8D85\u51FA\u53EF\u89C6\u533A"),
           createVNode(unref(ElDialog), mergeProps({
+            draggable: ifDraggable.value,
+            modal: !ifDraggable.value,
+            overflow: !ifDraggable.value,
             "z-index": dragLevelIndex.value,
-            draggable: props.showShrink,
-            modal: !props.showShrink,
-            overflow: !props.showShrink,
             "modal-penetrable": "",
             ref_key: "dialogTestRef",
             ref: dialogTestRef,
@@ -188,7 +194,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             modelValue: visible.value,
             "onUpdate:modelValue": ($event) => visible.value = $event,
             width: props.width,
-            top: __props.top
+            top: dialogTypeRight.value ? "16px" : props.top || null,
+            class: dialogTypeRight.value ? "h-[97vh] flex flex-col !my-4 !mr-4 !ml-auto" : null,
+            "body-class": dialogTypeRight.value ? "flex-grow h-0" : null
           }, _ctx.$attrs), {
             header: withCtx(() => [
               createElementVNode(
@@ -206,7 +214,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   ),
                   createElementVNode("div", { class: "text-lg cursor-pointer" }, [
                     renderSlot(_ctx.$slots, "title-operate-box"),
-                    __props.showShrink ? (openBlock(), createBlock(unref(HyIcon), {
+                    __props.ifShrink ? (openBlock(), createBlock(unref(HyIcon), {
                       key: 0,
                       onClick: hideToWorkspace,
                       "svg-name": "layout-dialog-narrow",
@@ -225,72 +233,74 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
               )
             ]),
             default: withCtx(() => [
-              createElementVNode(
-                "div",
-                {
-                  class: normalizeClass(["max-h-full flex flex-col text-main", { "h-full": ["right", "fullscreen"].includes(props.dialogType) }])
-                },
-                [
-                  renderSlot(_ctx.$slots, "content", {}, () => [
-                    createElementVNode("div", { class: "scroll-body overflow-auto h-0 flex-1 px-6 py-4" }, [
+              createElementVNode("div", { class: "h-full flex flex-col text-main" }, [
+                renderSlot(_ctx.$slots, "content", {}, () => [
+                  createElementVNode(
+                    "div",
+                    {
+                      class: normalizeClass([{
+                        "flex-grow h-0": dialogTypeRight.value
+                      }, "scroll-body overflow-auto px-6 py-4"])
+                    },
+                    [
                       renderSlot(_ctx.$slots, "default")
-                    ])
-                  ]),
-                  __props.showOperate ? (openBlock(), createElementBlock("div", {
-                    key: 0,
-                    class: "flex items-center flex-row-reverse justify-between p-5 pr-[26px] mt-auto"
-                  }, [
-                    renderSlot(_ctx.$slots, "operate-left-box"),
-                    createElementVNode("div", { class: "flex items-center" }, [
-                      renderSlot(_ctx.$slots, "operate", {}, () => [
-                        __props.showCancel ? (openBlock(), createBlock(unref(HyButton), {
-                          key: 0,
-                          type: __props.cancelType,
-                          disabled: loading.value,
-                          class: "!min-w-[120px]",
-                          onMousedown: withModifiers(() => {
-                          }, ["stop"]),
-                          onClick: onCancelHandler
-                        }, {
-                          default: withCtx(() => [
-                            createTextVNode(
-                              toDisplayString(unref(t)("dialog.cancel")),
-                              1
-                              /* TEXT */
-                            )
-                          ]),
-                          _: 1
-                          /* STABLE */
-                        }, 8, ["type", "disabled", "onMousedown"])) : createCommentVNode("v-if", true),
-                        __props.showSubmit ? (openBlock(), createBlock(unref(HyButton), {
-                          key: 1,
-                          type: __props.submitType,
-                          disabled: loading.value,
-                          class: "!min-w-[120px]",
-                          onClick: onSubmitHandler
-                        }, {
-                          default: withCtx(() => [
-                            createTextVNode(
-                              toDisplayString(unref(t)("dialog.confirm")),
-                              1
-                              /* TEXT */
-                            )
-                          ]),
-                          _: 1
-                          /* STABLE */
-                        }, 8, ["type", "disabled"])) : createCommentVNode("v-if", true)
-                      ]),
-                      renderSlot(_ctx.$slots, "operate-right-box")
-                    ])
-                  ])) : createCommentVNode("v-if", true)
-                ],
-                2
-                /* CLASS */
-              )
+                    ],
+                    2
+                    /* CLASS */
+                  )
+                ]),
+                __props.showOperate ? (openBlock(), createElementBlock("div", {
+                  key: 0,
+                  class: "flex items-center flex-row-reverse justify-between p-5 pr-[26px] mt-auto box-border"
+                }, [
+                  renderSlot(_ctx.$slots, "operate-left-box"),
+                  createElementVNode("div", { class: "flex items-center" }, [
+                    renderSlot(_ctx.$slots, "operate", {}, () => [
+                      __props.showCancel ? (openBlock(), createBlock(unref(HyButton), {
+                        key: 0,
+                        type: __props.cancelType,
+                        disabled: loading.value,
+                        class: "!min-w-[120px]",
+                        onMousedown: withModifiers(() => {
+                        }, ["stop"]),
+                        onClick: onCancelHandler
+                      }, {
+                        default: withCtx(() => [
+                          createTextVNode(
+                            toDisplayString(unref(t)("dialog.cancel")),
+                            1
+                            /* TEXT */
+                          )
+                        ]),
+                        _: 1
+                        /* STABLE */
+                      }, 8, ["type", "disabled", "onMousedown"])) : createCommentVNode("v-if", true),
+                      __props.showSubmit ? (openBlock(), createBlock(unref(HyButton), {
+                        key: 1,
+                        type: __props.submitType,
+                        disabled: loading.value,
+                        class: "!min-w-[120px]",
+                        onClick: onSubmitHandler
+                      }, {
+                        default: withCtx(() => [
+                          createTextVNode(
+                            toDisplayString(unref(t)("dialog.confirm")),
+                            1
+                            /* TEXT */
+                          )
+                        ]),
+                        _: 1
+                        /* STABLE */
+                      }, 8, ["type", "disabled"])) : createCommentVNode("v-if", true)
+                    ]),
+                    renderSlot(_ctx.$slots, "operate-right-box")
+                  ])
+                ])) : createCommentVNode("v-if", true)
+              ])
             ]),
             _: 3
             /* FORWARDED */
-          }, 16, ["z-index", "draggable", "modal", "overflow", "modal-class", "modelValue", "onUpdate:modelValue", "width", "top"])
+          }, 16, ["draggable", "modal", "overflow", "z-index", "modal-class", "modelValue", "onUpdate:modelValue", "width", "top", "class", "body-class"])
         ],
         2112
         /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */

package/es/components/hyTableActionButton/style/tableActionButton.scss

@@ -1,5 +1,9 @@
-.hy-action-button + .hy-action-button,
-.hy-action-button + .hy-button,
-.hy-button + .hy-action-button {
+.hy-table-action-button {
+  display: inline-block;
+}
+
+.hy-table-action-button + .hy-table-action-button,
+.hy-table-action-button + .hy-button,
+.hy-button + .hy-table-action-button {
   margin-left: 12px;
 }

package/es/components/hyTableActionButton/tableActionButton.vue.mjs

@@ -22,7 +22,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     size: {
       type: String,
       default: () => {
-        return "small";
+        return "default";
       }
     },
     disabled: {
@@ -122,7 +122,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       const _component_ArrowDown = resolveComponent("ArrowDown");
       return dataList.value.length ? (openBlock(), createElementBlock("div", {
         key: 0,
-        class: "hy-action-button"
+        class: "hy-table-action-button"
       }, [
         selectedData.value ? (openBlock(), createBlock(unref(HyTooltip), {
           key: 0,

package/es/version.mjs

@@ -1,3 +1,3 @@
-const version = "0.2.36";
+const version = "0.2.38";
 
 export { version };

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

@@ -21,19 +21,17 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     dialogType: {
       type: String,
       default: "default"
-      // default-默认类型 right-右侧弹窗 fullscreen-全屏
+      // default-默认类型 right-右侧弹窗
     },
     dialogClass: {
       type: String,
       default: "default"
     },
-    // zIndex: {
-    //   type: Number,
-    //   default: null, // default-默认类型 right-右侧弹窗 fullscreen-全屏
-    // },
     top: String,
-    // 支持缩小化
-    showShrink: { type: Boolean, default: false },
+    // 是否可缩小化
+    ifShrink: { type: Boolean, default: false },
+    // 是否拖拽
+    ifDraggable: { type: Boolean, default: false },
     showOperate: { type: Boolean, default: true },
     showClose: { type: Boolean, default: true },
     showCancel: {
@@ -78,6 +76,15 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     const { t } = useLocale.useLocale();
     const visible = vue.useModel(__props, "modelValue");
     const loading = vue.ref(false);
+    const dialogTypeRight = vue.computed(() => {
+      return props.dialogType === "right";
+    });
+    const ifDraggable = vue.computed(() => {
+      if (props.ifShrink) {
+        return true;
+      }
+      return props.ifDraggable;
+    });
     const dragLevelIndex = vue.ref(null);
     const minimized = vue.ref(false);
     const animating = vue.ref(false);
@@ -171,15 +178,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         vue.Fragment,
         null,
         [
-          vue.createCommentVNode("  @mousedown.stop"),
-          vue.createCommentVNode(`  :align-center="!['right', 'fullscreen'].includes(props.dialogType)"`),
-          vue.createCommentVNode('  body-class="h-0 flex-1"'),
-          vue.createCommentVNode('  :class="dialogClass"'),
+          vue.createCommentVNode("  draggable	\u4E3A Dialog \u542F\u7528\u53EF\u62D6\u62FD\u529F\u80FD"),
+          vue.createCommentVNode(" modal  \u662F\u5426\u9700\u8981\u906E\u7F69\u5C42"),
+          vue.createCommentVNode(" overflow  \u62D6\u52A8\u8303\u56F4\u53EF\u4EE5\u8D85\u51FA\u53EF\u89C6\u533A"),
           vue.createVNode(vue.unref(elementPlus.ElDialog), vue.mergeProps({
+            draggable: ifDraggable.value,
+            modal: !ifDraggable.value,
+            overflow: !ifDraggable.value,
             "z-index": dragLevelIndex.value,
-            draggable: props.showShrink,
-            modal: !props.showShrink,
-            overflow: !props.showShrink,
             "modal-penetrable": "",
             ref_key: "dialogTestRef",
             ref: dialogTestRef,
@@ -192,7 +198,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             modelValue: visible.value,
             "onUpdate:modelValue": ($event) => visible.value = $event,
             width: props.width,
-            top: __props.top
+            top: dialogTypeRight.value ? "16px" : props.top || null,
+            class: dialogTypeRight.value ? "h-[97vh] flex flex-col !my-4 !mr-4 !ml-auto" : null,
+            "body-class": dialogTypeRight.value ? "flex-grow h-0" : null
           }, _ctx.$attrs), {
             header: vue.withCtx(() => [
               vue.createElementVNode(
@@ -210,7 +218,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   ),
                   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), {
+                    __props.ifShrink ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.HyIcon), {
                       key: 0,
                       onClick: hideToWorkspace,
                       "svg-name": "layout-dialog-narrow",
@@ -229,72 +237,74 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
               )
             ]),
             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.createElementVNode("div", { class: "h-full flex flex-col text-main" }, [
+                vue.renderSlot(_ctx.$slots, "content", {}, () => [
+                  vue.createElementVNode(
+                    "div",
+                    {
+                      class: vue.normalizeClass([{
+                        "flex-grow h-0": dialogTypeRight.value
+                      }, "scroll-body overflow-auto 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] 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 */
-              )
+                    ],
+                    2
+                    /* CLASS */
+                  )
+                ]),
+                __props.showOperate ? (vue.openBlock(), vue.createElementBlock("div", {
+                  key: 0,
+                  class: "flex items-center flex-row-reverse justify-between p-5 pr-[26px] mt-auto box-border"
+                }, [
+                  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)
+              ])
             ]),
             _: 3
             /* FORWARDED */
-          }, 16, ["z-index", "draggable", "modal", "overflow", "modal-class", "modelValue", "onUpdate:modelValue", "width", "top"])
+          }, 16, ["draggable", "modal", "overflow", "z-index", "modal-class", "modelValue", "onUpdate:modelValue", "width", "top", "class", "body-class"])
         ],
         2112
         /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */

package/lib/components/hyTableActionButton/style/tableActionButton.scss

@@ -1,5 +1,9 @@
-.hy-action-button + .hy-action-button,
-.hy-action-button + .hy-button,
-.hy-button + .hy-action-button {
+.hy-table-action-button {
+  display: inline-block;
+}
+
+.hy-table-action-button + .hy-table-action-button,
+.hy-table-action-button + .hy-button,
+.hy-button + .hy-table-action-button {
   margin-left: 12px;
 }

package/lib/components/hyTableActionButton/tableActionButton.vue.js

@@ -26,7 +26,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     size: {
       type: String,
       default: () => {
-        return "small";
+        return "default";
       }
     },
     disabled: {
@@ -126,7 +126,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       const _component_ArrowDown = vue.resolveComponent("ArrowDown");
       return dataList.value.length ? (vue.openBlock(), vue.createElementBlock("div", {
         key: 0,
-        class: "hy-action-button"
+        class: "hy-table-action-button"
       }, [
         selectedData.value ? (vue.openBlock(), vue.createBlock(vue.unref(index.HyTooltip), {
           key: 0,

package/lib/version.js

@@ -1,5 +1,5 @@
 'use strict';
 
-const version = "0.2.36";
+const version = "0.2.38";
 
 exports.version = version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hy-dispatch-ui-v3",
-  "version": "0.2.37",
+  "version": "0.2.39",
   "main": "lib/index.js",
   "module": "es/index.mjs",
   "scripts": {