hy-dispatch-ui-v3 0.2.43 → 0.2.45

package/dist/tailwind.css

@@ -556,8 +556,8 @@
   height: 54px;
 }
 
-.h-\[97vh\] {
-  height: 97vh;
+.h-\[96vh\] {
+  height: 96vh;
 }
 
 .h-full {

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

@@ -19,9 +19,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       default: "default"
       // default-默认类型 right-右侧弹窗
     },
-    dialogClass: {
+    // body-Content-Class
+    bodyContentClass: {
       type: String,
-      default: "default"
+      default: ""
     },
     top: String,
     // 是否可缩小化
@@ -77,6 +78,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     const dialogTypeRight = computed(() => {
       return props.dialogType === "right";
     });
+    const bodyContentClass = computed(() => {
+      return `${props.bodyContentClass || null} ${dialogTypeRight.value ? "flex-grow h-0" : ""}`;
+    });
     const ifDraggable = computed(() => {
       if (props.ifShrink) {
         return true;
@@ -197,7 +201,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             "onUpdate:modelValue": ($event) => visible.value = $event,
             width: props.width,
             top: dialogTypeRight.value ? "16px" : props.top || null,
-            class: dialogTypeRight.value ? "h-[97vh] flex flex-col !my-4 !mr-4 !ml-auto" : null,
+            class: dialogTypeRight.value ? "h-[96vh] flex flex-col !my-4 !mr-4 !ml-auto" : null,
             "body-class": dialogTypeRight.value ? "flex-grow h-0" : null
           }, _ctx.$attrs), {
             header: withCtx(() => [
@@ -241,9 +245,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   createElementVNode(
                     "div",
                     {
-                      class: normalizeClass([{
-                        "flex-grow h-0": dialogTypeRight.value
-                      }, "scroll-body overflow-auto px-6 py-4"])
+                      class: normalizeClass([bodyContentClass.value, "scroll-body overflow-auto px-6 py-4"])
                     },
                     [
                       renderSlot(_ctx.$slots, "default")

package/es/components/hyInput/index.mjs

@@ -1,7 +1,9 @@
 import _sfc_main from './input.vue.mjs';
+import _sfc_main$1 from './inputSearch.vue.mjs';
 import { withInstall } from '../../utils/handler.mjs';
 
 const HyInput = withInstall(_sfc_main);
+const HyInputSearch = withInstall(_sfc_main$1);
 const ElInput = withInstall(_sfc_main, "ElInput");
 
-export { ElInput, HyInput, HyInput as default };
+export { ElInput, HyInput, HyInputSearch, HyInput as default };

package/es/components/hyInput/inputSearch.vue.mjs

@@ -0,0 +1,122 @@
+import { useModel, useTemplateRef, ref, computed, openBlock, createElementBlock, normalizeClass, renderSlot, createVNode, mergeProps, withKeys, createSlots, renderList, withCtx, normalizeProps, guardReactiveProps, createElementVNode, unref, mergeModels, defineComponent } from 'vue';
+import { ElIcon } from 'element-plus';
+import { Search } from '@element-plus/icons-vue';
+import _sfc_main$1 from './input.vue.mjs';
+
+import "./style/inputSearch.scss";
+
+const __default__ = defineComponent({
+  name: "HyInputSearch"
+});
+const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
+  props: /* @__PURE__ */ mergeModels({}, {
+    "modelValue": {
+      type: [String, Number],
+      default: ""
+    },
+    "modelModifiers": {}
+  }),
+  emits: /* @__PURE__ */ mergeModels(["search"], ["update:modelValue"]),
+  setup(__props, { expose: __expose, emit: __emit }) {
+    const emits = __emit;
+    const modelValue = useModel(__props, "modelValue");
+    const inputRef = useTemplateRef("inputRef");
+    const isSearchFocus = ref(false);
+    function onSearchInputHandler() {
+      isSearchFocus.value = true;
+    }
+    function onSearchBlurHandler() {
+      isSearchFocus.value = false;
+    }
+    function onSearchQueryHandler() {
+      emits("search", modelValue.value);
+    }
+    __expose({
+      blur() {
+        inputRef.value.blur();
+      },
+      clear() {
+        inputRef.value.clear();
+      },
+      focus() {
+        inputRef.value.focus();
+      },
+      input: computed(() => {
+        return inputRef.value.input;
+      }),
+      ref: computed(() => {
+        return inputRef.value.ref;
+      }),
+      resizeTextarea() {
+        inputRef.value.resizeTextarea();
+      },
+      select() {
+        inputRef.value.select();
+      },
+      textarea: computed(() => {
+        return inputRef.value.textarea;
+      }),
+      textareaStyle: computed(() => {
+        return inputRef.value.textareaStyle;
+      }),
+      isComposing: computed(() => {
+        return inputRef.value.isComposing;
+      }),
+      passwordVisible: computed(() => {
+        return inputRef.value.passwordVisible;
+      })
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock(
+        "div",
+        {
+          class: normalizeClass(["hy-input-search", { focus: isSearchFocus.value }])
+        },
+        [
+          renderSlot(_ctx.$slots, "before"),
+          createVNode(_sfc_main$1, mergeProps({
+            ref_key: "inputRef",
+            ref: inputRef,
+            modelValue: modelValue.value,
+            "onUpdate:modelValue": ($event) => modelValue.value = $event,
+            clearable: "",
+            class: "hy-input-search-item"
+          }, _ctx.$attrs, {
+            onFocus: onSearchInputHandler,
+            onBlur: onSearchBlurHandler,
+            onClear: onSearchQueryHandler,
+            onKeydown: withKeys(onSearchQueryHandler, ["enter"])
+          }), createSlots({
+            _: 2
+            /* DYNAMIC */
+          }, [
+            renderList(_ctx.$slots, (_, slotName) => {
+              return {
+                name: slotName,
+                fn: withCtx((scope) => [
+                  renderSlot(_ctx.$slots, slotName, normalizeProps(guardReactiveProps(scope)))
+                ])
+              };
+            })
+          ]), 1040, ["modelValue", "onUpdate:modelValue"]),
+          createElementVNode("div", {
+            class: "w-[32px] h-[32px] flex-shrink-0 flex items-center justify-center bg-background-3 rounded-[2px] cursor-pointer",
+            onClick: onSearchQueryHandler
+          }, [
+            createVNode(unref(ElIcon), { size: "18" }, {
+              default: withCtx(() => [
+                createVNode(unref(Search))
+              ]),
+              _: 1
+              /* STABLE */
+            })
+          ])
+        ],
+        2
+        /* CLASS */
+      );
+    };
+  }
+});
+
+export { _sfc_main as default };

package/es/components/hyInput/style/inputSearch.scss

@@ -0,0 +1,39 @@
+.hy-input-search {
+  width: 100%;
+  min-width: 160px;
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  border: 1px solid rgba(var(--hy-border));
+  border-radius: 4px;
+  box-sizing: border-box;
+  padding: 2px 4px;
+  overflow: hidden;
+  background: rgba(var(--hy-background-2));
+  &:hover,
+  &.focus {
+    border: 1px solid rgba(var(--hy-theme));
+  }
+
+  .hy-input-search-item {
+    width: 0;
+    flex: 1;
+    & > .hy-el-input__wrapper {
+      padding-left: 8px;
+      padding-right: 4px;
+    }
+    .hy-el-input__inner::placeholder {
+      font-size: 12px;
+    }
+    .hy-el-input__wrapper {
+      box-shadow: none;
+    }
+    .hy-el-input-group__append {
+      color: rgb(var(--hy-main));
+      background-color: rgba(var(--hy-background-2));
+      box-shadow: none;
+      padding: 4px;
+      min-height: 100%;
+    }
+  }
+}

package/es/components/hySearch/js/useAppSearch.mjs

@@ -33,9 +33,8 @@ const genPlaceholderHandler = (config) => {
   return { placeholder, startPlaceholder, endPlaceholder };
 };
 const genColumnWidth = (config) => {
-  let { width, type, attrs } = config || {};
-  let inputWidth;
-  if (!width) {
+  let { width, inputWidth, type, attrs } = config || {};
+  if (!width && !inputWidth) {
     if (type === "date-picker") {
       switch (attrs?.type) {
         case "datetimerange":
@@ -154,10 +153,10 @@ const useAppSearch = (config = [], model) => {
     const target = appSearchItemHandler(item);
     columns.push(target);
   }
-  const formModel = resetAppSearchValue(columns, model);
+  const filterModel = resetAppSearchValue(columns, model);
   return {
-    formModel: toRef(formModel),
-    formColumns: toRef(columns)
+    filterModel: toRef(filterModel),
+    filterColumns: toRef(columns)
   };
 };
 

package/es/components/hyTable/js/search.mjs

@@ -60,9 +60,14 @@ function useAppTableSearch(hy) {
       emits("reqSuccess", tableDataSource.value);
     }
   }
-  async function resetFn() {
+  async function resetFields() {
     await nextTick();
-    appSearchRef.value.resetFields();
+    if (appSearchRef.value) {
+      appSearchRef.value.resetFields();
+    }
+  }
+  async function resetFn() {
+    await resetFields();
     props.filterModel.query = null;
     getData(1);
   }
@@ -104,6 +109,7 @@ function useAppTableSearch(hy) {
     showFilter,
     getData,
     setData,
+    resetFields,
     resetFn,
     switchShowFilter,
     getTotalElements,

package/es/components/hyTable/js/useAppTable.mjs

@@ -142,8 +142,8 @@ const useAppTable = (config = {}) => {
   });
   return {
     tableColumns: toRef(tableColumns),
-    filterModel: appSearchForm.formModel,
-    filterColumns: appSearchForm.formColumns
+    filterModel: appSearchForm.filterModel,
+    filterColumns: appSearchForm.filterColumns
   };
 };
 

package/es/components/hyTable/table.vue.mjs

@@ -1,6 +1,6 @@
-import { defineComponent, useTemplateRef, openBlock, createElementBlock, createCommentVNode, createElementVNode, createBlock, unref, createVNode, withCtx, toDisplayString, normalizeClass, withKeys, renderSlot, createSlots, renderList, normalizeProps, guardReactiveProps, mergeProps, Fragment, withModifiers } from 'vue';
-import { ElIcon, ElInput, ElTable, ElTableColumn, ElDropdown, ElDropdownMenu, ElDropdownItem, ElAutoResizer, ElPagination } from 'element-plus';
-import { Filter, Search, MoreFilled } from '@element-plus/icons-vue';
+import { defineComponent, useTemplateRef, openBlock, createElementBlock, createCommentVNode, createElementVNode, createBlock, unref, createVNode, withCtx, toDisplayString, renderSlot, normalizeClass, createSlots, renderList, normalizeProps, guardReactiveProps, mergeProps, Fragment, withModifiers } from 'vue';
+import { ElIcon, ElTable, ElTableColumn, ElDropdown, ElDropdownMenu, ElDropdownItem, ElAutoResizer, ElPagination } from 'element-plus';
+import { Filter, MoreFilled } from '@element-plus/icons-vue';
 import { operatorFilterHandler, operatorClickHandler, operatorDisabledHandler, operatorDisableTextdHandler, renderContentHandler, renderHeaderHandler, useAppTableWrapper } from './js/index.mjs';
 import { useAppTableSearch } from './js/search.mjs';
 import _sfc_main$2 from './cpns/headerItem.vue.mjs';
@@ -9,6 +9,7 @@ import _sfc_main$3 from './cpns/virtualTable.vue.mjs';
 import { useLocale } from '../../hooks/useLocale.mjs';
 import { useMixins } from '../../hooks/useMixins.mjs';
 import { HyTooltip } from '../hyTooltip/index.mjs';
+import { HyInputSearch } from '../hyInput/index.mjs';
 import { HyButton } from '../hyButton/index.mjs';
 import { HyIcon } from '../hyIcon/index.mjs';
 import { HySearch } from '../hySearch/index.mjs';
@@ -231,6 +232,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       showFilter,
       getData,
       setData,
+      resetFields,
       resetFn,
       switchShowFilter,
       getTotalElements,
@@ -256,6 +258,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     __expose({
       getData,
       setData,
+      resetFields,
       resetFn,
       getSelectedList,
       getTotalElements,
@@ -278,7 +281,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             key: 0,
             class: "min-h-[36px] flex flex-row-reverse items-center justify-between gap-3 mb-4"
           }, [
-            createElementVNode("div", { class: "flex gap-3 whitespace-nowrap" }, [
+            createElementVNode("div", { class: "flex items-center gap-3 whitespace-nowrap" }, [
               __props.showEditable ? (openBlock(), createBlock(_sfc_main$1, {
                 key: 0,
                 columns: unref(tableColumns),
@@ -318,44 +321,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   }, null, 8, ["innerHTML"])
                 ]),
                 default: withCtx(() => [
-                  createElementVNode(
-                    "div",
-                    {
-                      class: normalizeClass(["border border-border hover:border-theme rounded overflow-hidden", { "!border-theme": unref(isSearchFocus) }])
-                    },
-                    [
-                      createVNode(unref(ElInput), {
-                        modelValue: __props.filterModel.query,
-                        "onUpdate:modelValue": ($event) => __props.filterModel.query = $event,
-                        class: "hy-table-search",
-                        placeholder: unref(t)("table.searchFor", [__props.controllerText || ""]),
-                        clearable: "",
-                        onFocus: unref(onSearchInputHandler),
-                        onBlur: unref(onSearchBlurHandler),
-                        onClear: unref(onSearchQueryHandler),
-                        onKeydown: withKeys(unref(onSearchQueryHandler), ["enter"])
-                      }, {
-                        append: withCtx(() => [
-                          createElementVNode("div", {
-                            class: "w-[32px] h-full flex items-center justify-center bg-background-3 rounded-[2px] cursor-pointer",
-                            onClick: unref(onSearchQueryHandler)
-                          }, [
-                            createVNode(unref(ElIcon), { size: "18" }, {
-                              default: withCtx(() => [
-                                createVNode(unref(Search))
-                              ]),
-                              _: 1
-                              /* STABLE */
-                            })
-                          ], 8, ["onClick"])
-                        ]),
-                        _: 1
-                        /* STABLE */
-                      }, 8, ["modelValue", "onUpdate:modelValue", "placeholder", "onFocus", "onBlur", "onClear", "onKeydown"])
-                    ],
-                    2
-                    /* CLASS */
-                  )
+                  createVNode(unref(HyInputSearch), {
+                    modelValue: __props.filterModel.query,
+                    "onUpdate:modelValue": ($event) => __props.filterModel.query = $event,
+                    placeholder: unref(t)("table.searchFor", [__props.controllerText || ""]),
+                    onSearch: unref(onSearchQueryHandler)
+                  }, null, 8, ["modelValue", "onUpdate:modelValue", "placeholder", "onSearch"])
                 ]),
                 _: 1
                 /* STABLE */

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

@@ -75,7 +75,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       return props.label;
     });
     function buttonChange(item) {
-      emits("change", item.value);
+      if (item) {
+        emits("change", item.value);
+      }
     }
     function getDataList(dataList2 = []) {
       const arr = [];

package/es/components/hyTableForm/tableForm.vue.mjs

@@ -224,6 +224,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         });
         initValidateHandler(dataSource.value);
         setData(dataSource.value);
+        emits("validate", {
+          ...statistics.value
+        });
       },
       deleteData(data) {
         if (!isArray(data)) {

package/es/components/index.mjs

@@ -18,7 +18,7 @@ export { HyMenu } from './hyMenu/index.mjs';
 export { HyTree } from './hyTree/index.mjs';
 export { HyVideoPlayer } from './hyVideoPlayer/index.mjs';
 export { HyAudioPlayer } from './hyAudioPlayer/index.mjs';
-export { ElInput, HyInput } from './hyInput/index.mjs';
+export { ElInput, HyInput, HyInputSearch } from './hyInput/index.mjs';
 export { ElTimePicker, HyTimePicker } from './hyTimePicker/index.mjs';
 export { HyBatchTableForm, HyTableForm } from './hyTableForm/index.mjs';
 export { HyTableActionButton } from './hyTableActionButton/index.mjs';

package/es/index.mjs

@@ -1,6 +1,6 @@
 import installer from './make-installer.mjs';
 export { ElDatePicker, HyDatePicker } from './components/hyDatePicker/index.mjs';
-export { ElInput, HyInput } from './components/hyInput/index.mjs';
+export { ElInput, HyInput, HyInputSearch } from './components/hyInput/index.mjs';
 export { ElTimePicker, HyTimePicker } from './components/hyTimePicker/index.mjs';
 export { ElTooltip, HyTooltip } from './components/hyTooltip/index.mjs';
 export { HyAudioPlayer } from './components/hyAudioPlayer/index.mjs';

package/es/version.mjs

@@ -1,3 +1,3 @@
-const version = "0.2.42";
+const version = "0.2.44";
 
 export { version };

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

@@ -23,9 +23,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       default: "default"
       // default-默认类型 right-右侧弹窗
     },
-    dialogClass: {
+    // body-Content-Class
+    bodyContentClass: {
       type: String,
-      default: "default"
+      default: ""
     },
     top: String,
     // 是否可缩小化
@@ -81,6 +82,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     const dialogTypeRight = vue.computed(() => {
       return props.dialogType === "right";
     });
+    const bodyContentClass = vue.computed(() => {
+      return `${props.bodyContentClass || null} ${dialogTypeRight.value ? "flex-grow h-0" : ""}`;
+    });
     const ifDraggable = vue.computed(() => {
       if (props.ifShrink) {
         return true;
@@ -201,7 +205,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             "onUpdate:modelValue": ($event) => visible.value = $event,
             width: props.width,
             top: dialogTypeRight.value ? "16px" : props.top || null,
-            class: dialogTypeRight.value ? "h-[97vh] flex flex-col !my-4 !mr-4 !ml-auto" : null,
+            class: dialogTypeRight.value ? "h-[96vh] flex flex-col !my-4 !mr-4 !ml-auto" : null,
             "body-class": dialogTypeRight.value ? "flex-grow h-0" : null
           }, _ctx.$attrs), {
             header: vue.withCtx(() => [
@@ -245,9 +249,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   vue.createElementVNode(
                     "div",
                     {
-                      class: vue.normalizeClass([{
-                        "flex-grow h-0": dialogTypeRight.value
-                      }, "scroll-body overflow-auto px-6 py-4"])
+                      class: vue.normalizeClass([bodyContentClass.value, "scroll-body overflow-auto px-6 py-4"])
                     },
                     [
                       vue.renderSlot(_ctx.$slots, "default")

package/lib/components/hyInput/index.js

@@ -3,11 +3,14 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var input = require('./input.vue.js');
+var inputSearch = require('./inputSearch.vue.js');
 var handler = require('../../utils/handler.js');
 
 const HyInput = handler.withInstall(input.default);
+const HyInputSearch = handler.withInstall(inputSearch.default);
 const ElInput = handler.withInstall(input.default, "ElInput");
 
 exports.ElInput = ElInput;
 exports.HyInput = HyInput;
+exports.HyInputSearch = HyInputSearch;
 exports.default = HyInput;

package/lib/components/hyInput/inputSearch.vue.js

@@ -0,0 +1,126 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var vue = require('vue');
+var elementPlus = require('element-plus');
+var iconsVue = require('@element-plus/icons-vue');
+var input = require('./input.vue.js');
+
+import "./style/inputSearch.scss";
+
+const __default__ = vue.defineComponent({
+  name: "HyInputSearch"
+});
+const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
+  props: /* @__PURE__ */ vue.mergeModels({}, {
+    "modelValue": {
+      type: [String, Number],
+      default: ""
+    },
+    "modelModifiers": {}
+  }),
+  emits: /* @__PURE__ */ vue.mergeModels(["search"], ["update:modelValue"]),
+  setup(__props, { expose: __expose, emit: __emit }) {
+    const emits = __emit;
+    const modelValue = vue.useModel(__props, "modelValue");
+    const inputRef = vue.useTemplateRef("inputRef");
+    const isSearchFocus = vue.ref(false);
+    function onSearchInputHandler() {
+      isSearchFocus.value = true;
+    }
+    function onSearchBlurHandler() {
+      isSearchFocus.value = false;
+    }
+    function onSearchQueryHandler() {
+      emits("search", modelValue.value);
+    }
+    __expose({
+      blur() {
+        inputRef.value.blur();
+      },
+      clear() {
+        inputRef.value.clear();
+      },
+      focus() {
+        inputRef.value.focus();
+      },
+      input: vue.computed(() => {
+        return inputRef.value.input;
+      }),
+      ref: vue.computed(() => {
+        return inputRef.value.ref;
+      }),
+      resizeTextarea() {
+        inputRef.value.resizeTextarea();
+      },
+      select() {
+        inputRef.value.select();
+      },
+      textarea: vue.computed(() => {
+        return inputRef.value.textarea;
+      }),
+      textareaStyle: vue.computed(() => {
+        return inputRef.value.textareaStyle;
+      }),
+      isComposing: vue.computed(() => {
+        return inputRef.value.isComposing;
+      }),
+      passwordVisible: vue.computed(() => {
+        return inputRef.value.passwordVisible;
+      })
+    });
+    return (_ctx, _cache) => {
+      return vue.openBlock(), vue.createElementBlock(
+        "div",
+        {
+          class: vue.normalizeClass(["hy-input-search", { focus: isSearchFocus.value }])
+        },
+        [
+          vue.renderSlot(_ctx.$slots, "before"),
+          vue.createVNode(input.default, vue.mergeProps({
+            ref_key: "inputRef",
+            ref: inputRef,
+            modelValue: modelValue.value,
+            "onUpdate:modelValue": ($event) => modelValue.value = $event,
+            clearable: "",
+            class: "hy-input-search-item"
+          }, _ctx.$attrs, {
+            onFocus: onSearchInputHandler,
+            onBlur: onSearchBlurHandler,
+            onClear: onSearchQueryHandler,
+            onKeydown: vue.withKeys(onSearchQueryHandler, ["enter"])
+          }), vue.createSlots({
+            _: 2
+            /* DYNAMIC */
+          }, [
+            vue.renderList(_ctx.$slots, (_, slotName) => {
+              return {
+                name: slotName,
+                fn: vue.withCtx((scope) => [
+                  vue.renderSlot(_ctx.$slots, slotName, vue.normalizeProps(vue.guardReactiveProps(scope)))
+                ])
+              };
+            })
+          ]), 1040, ["modelValue", "onUpdate:modelValue"]),
+          vue.createElementVNode("div", {
+            class: "w-[32px] h-[32px] flex-shrink-0 flex items-center justify-center bg-background-3 rounded-[2px] cursor-pointer",
+            onClick: onSearchQueryHandler
+          }, [
+            vue.createVNode(vue.unref(elementPlus.ElIcon), { size: "18" }, {
+              default: vue.withCtx(() => [
+                vue.createVNode(vue.unref(iconsVue.Search))
+              ]),
+              _: 1
+              /* STABLE */
+            })
+          ])
+        ],
+        2
+        /* CLASS */
+      );
+    };
+  }
+});
+
+exports.default = _sfc_main;

package/lib/components/hyInput/style/inputSearch.scss

@@ -0,0 +1,39 @@
+.hy-input-search {
+  width: 100%;
+  min-width: 160px;
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  border: 1px solid rgba(var(--hy-border));
+  border-radius: 4px;
+  box-sizing: border-box;
+  padding: 2px 4px;
+  overflow: hidden;
+  background: rgba(var(--hy-background-2));
+  &:hover,
+  &.focus {
+    border: 1px solid rgba(var(--hy-theme));
+  }
+
+  .hy-input-search-item {
+    width: 0;
+    flex: 1;
+    & > .hy-el-input__wrapper {
+      padding-left: 8px;
+      padding-right: 4px;
+    }
+    .hy-el-input__inner::placeholder {
+      font-size: 12px;
+    }
+    .hy-el-input__wrapper {
+      box-shadow: none;
+    }
+    .hy-el-input-group__append {
+      color: rgb(var(--hy-main));
+      background-color: rgba(var(--hy-background-2));
+      box-shadow: none;
+      padding: 4px;
+      min-height: 100%;
+    }
+  }
+}

package/lib/components/hySearch/js/useAppSearch.js

@@ -35,9 +35,8 @@ const genPlaceholderHandler = (config) => {
   return { placeholder, startPlaceholder, endPlaceholder };
 };
 const genColumnWidth = (config) => {
-  let { width, type, attrs } = config || {};
-  let inputWidth;
-  if (!width) {
+  let { width, inputWidth, type, attrs } = config || {};
+  if (!width && !inputWidth) {
     if (type === "date-picker") {
       switch (attrs?.type) {
         case "datetimerange":
@@ -156,10 +155,10 @@ const useAppSearch = (config = [], model) => {
     const target = appSearchItemHandler(item);
     columns.push(target);
   }
-  const formModel = resetAppSearchValue(columns, model);
+  const filterModel = resetAppSearchValue(columns, model);
   return {
-    formModel: vue.toRef(formModel),
-    formColumns: vue.toRef(columns)
+    filterModel: vue.toRef(filterModel),
+    filterColumns: vue.toRef(columns)
   };
 };
 

package/lib/components/hyTable/js/search.js

@@ -62,9 +62,14 @@ function useAppTableSearch(hy) {
       emits("reqSuccess", tableDataSource.value);
     }
   }
-  async function resetFn() {
+  async function resetFields() {
     await vue.nextTick();
-    appSearchRef.value.resetFields();
+    if (appSearchRef.value) {
+      appSearchRef.value.resetFields();
+    }
+  }
+  async function resetFn() {
+    await resetFields();
     props.filterModel.query = null;
     getData(1);
   }
@@ -106,6 +111,7 @@ function useAppTableSearch(hy) {
     showFilter,
     getData,
     setData,
+    resetFields,
     resetFn,
     switchShowFilter,
     getTotalElements,

package/lib/components/hyTable/js/useAppTable.js

@@ -144,8 +144,8 @@ const useAppTable = (config = {}) => {
   });
   return {
     tableColumns: vue.toRef(tableColumns),
-    filterModel: appSearchForm.formModel,
-    filterColumns: appSearchForm.formColumns
+    filterModel: appSearchForm.filterModel,
+    filterColumns: appSearchForm.filterColumns
   };
 };
 

package/lib/components/hyTable/table.vue.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var vue = require('vue');
 var elementPlus = require('element-plus');
 var iconsVue = require('@element-plus/icons-vue');
-var index$4 = require('./js/index.js');
+var index$5 = require('./js/index.js');
 var search = require('./js/search.js');
 var headerItem = require('./cpns/headerItem.vue.js');
 var columnSelect = require('./cpns/columnSelect.vue.js');
@@ -13,9 +13,10 @@ var virtualTable = require('./cpns/virtualTable.vue.js');
 var useLocale = require('../../hooks/useLocale.js');
 var useMixins = require('../../hooks/useMixins.js');
 var index = require('../hyTooltip/index.js');
-var index$1 = require('../hyButton/index.js');
-var index$2 = require('../hyIcon/index.js');
-var index$3 = require('../hySearch/index.js');
+var index$1 = require('../hyInput/index.js');
+var index$2 = require('../hyButton/index.js');
+var index$3 = require('../hyIcon/index.js');
+var index$4 = require('../hySearch/index.js');
 var adaptive = require('../../utils/adaptive.js');
 var is = require('../../utils/is.js');
 
@@ -235,6 +236,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       showFilter,
       getData,
       setData,
+      resetFields,
       resetFn,
       switchShowFilter,
       getTotalElements,
@@ -252,7 +254,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         operatorDropdownRef,
         appSearchRef
       },
-      [index$4.useAppTableWrapper, search.useAppTableSearch]
+      [index$5.useAppTableWrapper, search.useAppTableSearch]
     );
     if (props.defaultGetData) {
       getData(1);
@@ -260,6 +262,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     __expose({
       getData,
       setData,
+      resetFields,
       resetFn,
       getSelectedList,
       getTotalElements,
@@ -282,7 +285,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             key: 0,
             class: "min-h-[36px] flex flex-row-reverse items-center justify-between gap-3 mb-4"
           }, [
-            vue.createElementVNode("div", { class: "flex gap-3 whitespace-nowrap" }, [
+            vue.createElementVNode("div", { class: "flex items-center gap-3 whitespace-nowrap" }, [
               __props.showEditable ? (vue.openBlock(), vue.createBlock(columnSelect.default, {
                 key: 0,
                 columns: vue.unref(tableColumns),
@@ -322,54 +325,22 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   }, null, 8, ["innerHTML"])
                 ]),
                 default: vue.withCtx(() => [
-                  vue.createElementVNode(
-                    "div",
-                    {
-                      class: vue.normalizeClass(["border border-border hover:border-theme rounded overflow-hidden", { "!border-theme": vue.unref(isSearchFocus) }])
-                    },
-                    [
-                      vue.createVNode(vue.unref(elementPlus.ElInput), {
-                        modelValue: __props.filterModel.query,
-                        "onUpdate:modelValue": ($event) => __props.filterModel.query = $event,
-                        class: "hy-table-search",
-                        placeholder: vue.unref(t)("table.searchFor", [__props.controllerText || ""]),
-                        clearable: "",
-                        onFocus: vue.unref(onSearchInputHandler),
-                        onBlur: vue.unref(onSearchBlurHandler),
-                        onClear: vue.unref(onSearchQueryHandler),
-                        onKeydown: vue.withKeys(vue.unref(onSearchQueryHandler), ["enter"])
-                      }, {
-                        append: vue.withCtx(() => [
-                          vue.createElementVNode("div", {
-                            class: "w-[32px] h-full flex items-center justify-center bg-background-3 rounded-[2px] cursor-pointer",
-                            onClick: vue.unref(onSearchQueryHandler)
-                          }, [
-                            vue.createVNode(vue.unref(elementPlus.ElIcon), { size: "18" }, {
-                              default: vue.withCtx(() => [
-                                vue.createVNode(vue.unref(iconsVue.Search))
-                              ]),
-                              _: 1
-                              /* STABLE */
-                            })
-                          ], 8, ["onClick"])
-                        ]),
-                        _: 1
-                        /* STABLE */
-                      }, 8, ["modelValue", "onUpdate:modelValue", "placeholder", "onFocus", "onBlur", "onClear", "onKeydown"])
-                    ],
-                    2
-                    /* CLASS */
-                  )
+                  vue.createVNode(vue.unref(index$1.HyInputSearch), {
+                    modelValue: __props.filterModel.query,
+                    "onUpdate:modelValue": ($event) => __props.filterModel.query = $event,
+                    placeholder: vue.unref(t)("table.searchFor", [__props.controllerText || ""]),
+                    onSearch: vue.unref(onSearchQueryHandler)
+                  }, null, 8, ["modelValue", "onUpdate:modelValue", "placeholder", "onSearch"])
                 ]),
                 _: 1
                 /* STABLE */
-              })) : (vue.openBlock(), vue.createBlock(vue.unref(index$1.HyButton), {
+              })) : (vue.openBlock(), vue.createBlock(vue.unref(index$2.HyButton), {
                 key: 3,
                 type: "primary",
                 onClick: ($event) => vue.unref(getData)()
               }, {
                 default: vue.withCtx(() => [
-                  vue.createVNode(vue.unref(index$2.HyIcon), {
+                  vue.createVNode(vue.unref(index$3.HyIcon), {
                     class: "w-[12px] h-[12px]",
                     "svg-name": "ops-button-icon-refres-v2"
                   })
@@ -387,7 +358,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             ])) : vue.createCommentVNode("v-if", true)
           ])) : vue.createCommentVNode("v-if", true),
           vue.createCommentVNode(" \u67E5\u8BE2\u8FC7\u6EE4 "),
-          __props.filterColumns.length > 0 ? (vue.openBlock(), vue.createBlock(vue.unref(index$3.HySearch), {
+          __props.filterColumns.length > 0 ? (vue.openBlock(), vue.createBlock(vue.unref(index$4.HySearch), {
             key: 1,
             ref_key: "appSearchRef",
             ref: appSearchRef,
@@ -471,11 +442,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                 }, {
                                   default: vue.withCtx(() => [
                                     vue.renderSlot(_ctx.$slots, column.headerSlot, vue.mergeProps({ ref_for: true }, { column, $index: scope.$index }), () => [
-                                      !vue.unref(is.isEmpty)(vue.unref(index$4.renderHeaderHandler)(column, scope)) ? (vue.openBlock(), vue.createBlock(vue.unref(index.HyTooltip), {
+                                      !vue.unref(is.isEmpty)(vue.unref(index$5.renderHeaderHandler)(column, scope)) ? (vue.openBlock(), vue.createBlock(vue.unref(index.HyTooltip), {
                                         key: 0,
                                         "is-always": false,
                                         "over-line": 1,
-                                        content: vue.unref(index$4.renderHeaderHandler)(column, scope)
+                                        content: vue.unref(index$5.renderHeaderHandler)(column, scope)
                                       }, null, 8, ["content"])) : vue.createCommentVNode("v-if", true)
                                     ])
                                   ]),
@@ -491,7 +462,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                   (vue.openBlock(true), vue.createElementBlock(
                                     vue.Fragment,
                                     null,
-                                    vue.renderList(vue.unref(index$4.operatorFilterHandler)(
+                                    vue.renderList(vue.unref(index$5.operatorFilterHandler)(
                                       column,
                                       scope,
                                       "default"
@@ -505,11 +476,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                         default: vue.withCtx(() => [
                                           vue.createElementVNode("div", {
                                             class: vue.normalizeClass(["w-[40px] h-[48px] inline-flex flex-col items-center justify-center text-xs hover:font-bold border border-transparent hover:border-theme hover:shadow-[0px_0px_5px_0px_rgba(var(--hy-theme),0.5)] rounded box-border cursor-pointer", citem.className]),
-                                            onClick: vue.withModifiers(($event) => vue.unref(index$4.operatorClickHandler)(cindex, column, scope, "default"), ["stop"]),
+                                            onClick: vue.withModifiers(($event) => vue.unref(index$5.operatorClickHandler)(cindex, column, scope, "default"), ["stop"]),
                                             onContextmenu: vue.withModifiers(() => {
                                             }, ["stop"])
                                           }, [
-                                            vue.createVNode(vue.unref(index$2.HyIcon), {
+                                            vue.createVNode(vue.unref(index$3.HyIcon), {
                                               "svg-name": citem.svgName,
                                               "class-name": "!w-4 !h-4"
                                             }, null, 8, ["svg-name"]),
@@ -535,7 +506,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                     128
                                     /* KEYED_FRAGMENT */
                                   )),
-                                  vue.unref(index$4.operatorFilterHandler)(column, scope, "more")?.length ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElDropdown), {
+                                  vue.unref(index$5.operatorFilterHandler)(column, scope, "more")?.length ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElDropdown), {
                                     key: 0,
                                     ref_for: true,
                                     ref_key: "operatorDropdownRef",
@@ -543,7 +514,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                     trigger: "click",
                                     "popper-style": "min-width: 150px",
                                     placement: "bottom",
-                                    onCommand: ($event) => vue.unref(index$4.operatorClickHandler)($event, column, scope, "more")
+                                    onCommand: ($event) => vue.unref(index$5.operatorClickHandler)($event, column, scope, "more")
                                   }, {
                                     dropdown: vue.withCtx(() => [
                                       vue.createVNode(
@@ -554,7 +525,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                             (vue.openBlock(true), vue.createElementBlock(
                                               vue.Fragment,
                                               null,
-                                              vue.renderList(vue.unref(index$4.operatorFilterHandler)(
+                                              vue.renderList(vue.unref(index$5.operatorFilterHandler)(
                                                 column,
                                                 scope,
                                                 "more"
@@ -562,7 +533,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                                 return vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElDropdownItem), {
                                                   key: cindex,
                                                   command: cindex,
-                                                  disabled: vue.unref(index$4.operatorDisabledHandler)(citem, scope)
+                                                  disabled: vue.unref(index$5.operatorDisabledHandler)(citem, scope)
                                                 }, {
                                                   default: vue.withCtx(() => [
                                                     vue.createElementVNode("span", null, [
@@ -573,13 +544,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                                         1
                                                         /* TEXT */
                                                       ),
-                                                      vue.unref(index$4.operatorDisabledHandler)(citem, scope) ? (vue.openBlock(), vue.createElementBlock(
+                                                      vue.unref(index$5.operatorDisabledHandler)(citem, scope) ? (vue.openBlock(), vue.createElementBlock(
                                                         "span",
                                                         {
                                                           key: 0,
                                                           class: "text-xs leading-1"
                                                         },
-                                                        "\uFF08" + vue.toDisplayString(vue.unref(index$4.operatorDisableTextdHandler)(citem, scope)) + "\uFF09",
+                                                        "\uFF08" + vue.toDisplayString(vue.unref(index$5.operatorDisableTextdHandler)(citem, scope)) + "\uFF09",
                                                         1
                                                         /* TEXT */
                                                       )) : vue.createCommentVNode("v-if", true)
@@ -645,11 +616,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                   vue.Fragment,
                                   { key: 2 },
                                   [
-                                    !vue.unref(is.isEmpty)(vue.unref(index$4.renderContentHandler)(column, scope)) ? (vue.openBlock(), vue.createBlock(vue.unref(index.HyTooltip), {
+                                    !vue.unref(is.isEmpty)(vue.unref(index$5.renderContentHandler)(column, scope)) ? (vue.openBlock(), vue.createBlock(vue.unref(index.HyTooltip), {
                                       key: 0,
                                       "over-line": 2,
                                       "is-always": false,
-                                      content: vue.unref(index$4.renderContentHandler)(column, scope)
+                                      content: vue.unref(index$5.renderContentHandler)(column, scope)
                                     }, null, 8, ["content"])) : (vue.openBlock(), vue.createElementBlock("span", {
                                       key: 1,
                                       class: "text-auxiliary"
@@ -776,7 +747,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             "virtual-triggering": "",
             trigger: "contextmenu",
             placement: "bottom",
-            onCommand: ($event) => vue.unref(index$4.operatorClickHandler)(
+            onCommand: ($event) => vue.unref(index$5.operatorClickHandler)(
               $event,
               vue.unref(tableTriggerRef).column,
               vue.unref(tableTriggerRef).scope
@@ -788,14 +759,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   (vue.openBlock(true), vue.createElementBlock(
                     vue.Fragment,
                     null,
-                    vue.renderList(vue.unref(index$4.operatorFilterHandler)(
+                    vue.renderList(vue.unref(index$5.operatorFilterHandler)(
                       vue.unref(tableTriggerRef).column,
                       vue.unref(tableTriggerRef).scope
                     ), (citem, cindex) => {
                       return vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElDropdownItem), {
                         key: cindex,
                         command: cindex,
-                        disabled: vue.unref(index$4.operatorDisabledHandler)(citem, vue.unref(tableTriggerRef).scope)
+                        disabled: vue.unref(index$5.operatorDisabledHandler)(citem, vue.unref(tableTriggerRef).scope)
                       }, {
                         default: vue.withCtx(() => [
                           vue.createElementVNode("span", null, [
@@ -806,13 +777,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                               1
                               /* TEXT */
                             ),
-                            vue.unref(index$4.operatorDisabledHandler)(citem, vue.unref(tableTriggerRef).scope) ? (vue.openBlock(), vue.createElementBlock(
+                            vue.unref(index$5.operatorDisabledHandler)(citem, vue.unref(tableTriggerRef).scope) ? (vue.openBlock(), vue.createElementBlock(
                               "span",
                               {
                                 key: 0,
                                 class: "text-xs leading-1"
                               },
-                              "\uFF08" + vue.toDisplayString(vue.unref(index$4.operatorDisableTextdHandler)(citem, vue.unref(tableTriggerRef).scope)) + "\uFF09",
+                              "\uFF08" + vue.toDisplayString(vue.unref(index$5.operatorDisableTextdHandler)(citem, vue.unref(tableTriggerRef).scope)) + "\uFF09",
                               1
                               /* TEXT */
                             )) : vue.createCommentVNode("v-if", true)

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

@@ -79,7 +79,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       return props.label;
     });
     function buttonChange(item) {
-      emits("change", item.value);
+      if (item) {
+        emits("change", item.value);
+      }
     }
     function getDataList(dataList2 = []) {
       const arr = [];

package/lib/components/hyTableForm/tableForm.vue.js

@@ -228,6 +228,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         });
         initValidateHandler(dataSource.value);
         setData(dataSource.value);
+        emits("validate", {
+          ...statistics.value
+        });
       },
       deleteData(data) {
         if (!is.isArray(data)) {

package/lib/components/index.js

@@ -56,6 +56,7 @@ exports.HyVideoPlayer = index$o.HyVideoPlayer;
 exports.HyAudioPlayer = index$4.HyAudioPlayer;
 exports.ElInput = index$1.ElInput;
 exports.HyInput = index$1.HyInput;
+exports.HyInputSearch = index$1.HyInputSearch;
 exports.ElTimePicker = index$2.ElTimePicker;
 exports.HyTimePicker = index$2.HyTimePicker;
 exports.HyBatchTableForm = index$5.HyBatchTableForm;

package/lib/index.js

@@ -62,6 +62,7 @@ exports.ElDatePicker = index.ElDatePicker;
 exports.HyDatePicker = index.HyDatePicker;
 exports.ElInput = index$1.ElInput;
 exports.HyInput = index$1.HyInput;
+exports.HyInputSearch = index$1.HyInputSearch;
 exports.ElTimePicker = index$2.ElTimePicker;
 exports.HyTimePicker = index$2.HyTimePicker;
 exports.ElTooltip = index$3.ElTooltip;

package/lib/version.js

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

package/package.json

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