hy-dispatch-ui-v3 0.1.3 → 0.1.4

package/dist/tailwind.css

@@ -724,6 +724,14 @@ video {
   height: 0px;
 }
 
+.h-\[12px\] {
+  height: 12px;
+}
+
+.h-\[32px\] {
+  height: 32px;
+}
+
 .h-\[364px\] {
   height: 364px;
 }
@@ -768,6 +776,10 @@ video {
   width: 1.25rem;
 }
 
+.w-\[12px\] {
+  width: 12px;
+}
+
 .w-\[160px\] {
   width: 160px;
 }

package/es/components/appTable/appTable.vue.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, useTemplateRef, openBlock, createElementBlock, createCommentVNode, createElementVNode, createBlock, unref, createVNode, withCtx, toDisplayString, withKeys, renderSlot, normalizeClass, createSlots, renderList, normalizeProps, guardReactiveProps, mergeProps, Fragment, withModifiers } from 'vue';
+import { defineComponent, useTemplateRef, resolveComponent, openBlock, createElementBlock, createCommentVNode, createElementVNode, createBlock, unref, createVNode, withCtx, toDisplayString, withKeys, renderSlot, normalizeClass, createSlots, renderList, normalizeProps, guardReactiveProps, mergeProps, Fragment, withModifiers } from 'vue';
 import { ElIcon, ElInput, ElButton, ElTable, ElTableColumn, ElDropdown, ElDropdownMenu, ElDropdownItem, ElPagination } from 'element-plus';
 import { Filter, Search } from '@element-plus/icons-vue';
 import { AppTooltip } from '../appTooltip/index.mjs';
@@ -6,6 +6,7 @@ import { operatorFilterHandler, operatorClickHandler, operatorDisabledHandler, o
 import { useAppTableSearch } from './js/search.mjs';
 import _sfc_main$1 from './cpns/columnSelect.vue.mjs';
 import { useMixins } from '../../hooks/useMixins.mjs';
+import { AppButton } from '../appButton/index.mjs';
 import { AppSearch } from '../appSearch/index.mjs';
 import { parseRem } from '../../utils/adaptive.mjs';
 import { AppIconBox } from '../appIconBox/index.mjs';
@@ -89,6 +90,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       default: "",
       required: false
     },
+    filterModel: {
+      type: Object,
+      default: () => ({})
+    },
     filterColumns: {
       // 表格筛选配置
       type: Array,
@@ -177,8 +182,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       onTableSelectHandler,
       // useAppTableSearch
       // 表单查询
-      formModel,
-      formColumns,
       totalElements,
       showFilter,
       getData,
@@ -216,6 +219,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       clearSelectedList
     });
     return (_ctx, _cache) => {
+      const _component_AppIcon = resolveComponent("AppIcon");
       return openBlock(), createElementBlock(
         "div",
         {
@@ -234,9 +238,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 "origin-columns": props.tableColumns,
                 onConfirm: unref(onTableColumnsSelectHandler)
               }, null, 8, ["columns", "columns-editable", "origin-columns", "onConfirm"])) : createCommentVNode("v-if", true),
-              unref(formColumns).length > 0 ? (openBlock(), createElementBlock("div", {
+              __props.filterColumns.length > 0 ? (openBlock(), createElementBlock("div", {
                 key: 1,
-                class: "flex items-center gap-[10px] clickBox px-3 select-none rounded hover:bg-background-2",
+                class: "h-[32px] flex items-center gap-[10px] clickBox px-3 select-none rounded hover:bg-background-2",
                 onClick: unref(switchShowFilter)
               }, [
                 createVNode(unref(ElIcon), { size: "12" }, {
@@ -256,8 +260,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
               ], 8, ["onClick"])) : createCommentVNode("v-if", true),
               unref(searchPlaceholder) ? (openBlock(), createBlock(unref(ElInput), {
                 key: 2,
-                modelValue: unref(formModel).query,
-                "onUpdate:modelValue": ($event) => unref(formModel).query = $event,
+                modelValue: __props.filterModel.query,
+                "onUpdate:modelValue": ($event) => __props.filterModel.query = $event,
                 class: "w-[160px]",
                 placeholder: unref(t)("table.searchFor", [unref(searchPlaceholder)]),
                 onKeydown: withKeys(unref(onSearchQueryHandler), ["enter"])
@@ -270,7 +274,21 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 ]),
                 _: 1
                 /* STABLE */
-              }, 8, ["modelValue", "onUpdate:modelValue", "placeholder", "onKeydown"])) : createCommentVNode("v-if", true)
+              }, 8, ["modelValue", "onUpdate:modelValue", "placeholder", "onKeydown"])) : (openBlock(), createBlock(unref(AppButton), {
+                key: 3,
+                type: "primary",
+                onClick: ($event) => unref(getData)()
+              }, {
+                default: withCtx(() => [
+                  createVNode(_component_AppIcon, {
+                    class: "w-[12px] h-[12px]",
+                    "svg-name": "refres"
+                  })
+                ]),
+                _: 1
+                /* STABLE */
+              }, 8, ["onClick"])),
+              renderSlot(_ctx.$slots, "operator-right-box")
             ]),
             _ctx.$slots["operator-left-box"] ? (openBlock(), createElementBlock("div", {
               key: 0,
@@ -280,12 +298,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             ])) : createCommentVNode("v-if", true)
           ]),
           createCommentVNode(" \u67E5\u8BE2\u8FC7\u6EE4 "),
-          unref(formColumns).length > 0 ? (openBlock(), createBlock(unref(AppSearch), {
+          __props.filterColumns.length > 0 ? (openBlock(), createBlock(unref(AppSearch), {
             key: 0,
             ref_key: "appSearchRef",
             ref: appSearchRef,
-            model: unref(formModel),
-            columns: unref(formColumns),
+            model: __props.filterModel,
+            columns: __props.filterColumns,
             hidden: !unref(showFilter),
             class: normalizeClass({ "mb-4": unref(showFilter) }),
             onSearch: ($event) => unref(getData)(1)
@@ -523,10 +541,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 /* TEXT */
               ),
               createVNode(unref(ElPagination), {
-                "current-page": unref(formModel).page,
-                "onUpdate:currentPage": ($event) => unref(formModel).page = $event,
-                "page-size": unref(formModel).size,
-                "onUpdate:pageSize": ($event) => unref(formModel).size = $event,
+                "current-page": __props.filterModel.page,
+                "onUpdate:currentPage": ($event) => __props.filterModel.page = $event,
+                "page-size": __props.filterModel.size,
+                "onUpdate:pageSize": ($event) => __props.filterModel.size = $event,
                 total: unref(totalElements),
                 "pager-count": __props.pagerCount,
                 "page-sizes": [10, 15, 30, 50, 100],

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

@@ -1,5 +1,4 @@
 import { ref, nextTick, unref } from 'vue';
-import { useAppSearch } from '../../appSearch/js/useAppSearch.mjs';
 import { useApi } from '../../../hooks/useApi.mjs';
 import { isEmpty, isNumber, isString } from '../../../utils/is.mjs';
 
@@ -14,12 +13,6 @@ function useAppTableSearch(hy) {
     clearSelection
   } = hy;
   const { api } = useApi();
-  const { formModel, formColumns } = useAppSearch(props.filterColumns, {
-    page: 1,
-    // 当前分页数
-    size: 15
-    // 每页数量
-  });
   const totalElements = ref(0);
   const showFilter = ref(true);
   function switchShowFilter() {
@@ -31,7 +24,7 @@ function useAppTableSearch(hy) {
     return new Promise((resolve, reject) => {
       if (!isEmpty(page)) {
         if (isNumber(page) || isString(page)) {
-          formModel.value.page = page;
+          props.filterModel.page = page;
         }
       }
       const params = getParametersFn();
@@ -53,7 +46,7 @@ function useAppTableSearch(hy) {
     });
     function successFun(res) {
       var _a;
-      if (!((_a = res.data.content) == null ? void 0 : _a.length) && formModel.value.page !== 1) {
+      if (!((_a = res.data.content) == null ? void 0 : _a.length) && props.filterModel.page !== 1) {
         getData(1);
         return;
       }
@@ -70,14 +63,14 @@ function useAppTableSearch(hy) {
   async function resetFn() {
     await nextTick();
     appSearchRef.value.resetFields();
-    formModel.value.query = null;
+    props.filterModel.query = null;
     getData(1);
   }
   function getParametersFn() {
     return Object.assign(
       {
-        ...unref(formModel),
-        page: unref(formModel).page - 1
+        ...props.filterModel,
+        page: props.filterModel.page - 1
       },
       unref(props.requestParams)
     );
@@ -93,22 +86,20 @@ function useAppTableSearch(hy) {
     closeAppTableLoading();
   }
   function onSizeChangeHandler(val) {
-    formModel.value.page = 1;
-    formModel.value.size = val;
+    props.filterModel.page = 1;
+    props.filterModel.size = val;
     getData();
   }
   function onCurrentChangeHandler(val) {
-    formModel.value.page = val;
+    props.filterModel.page = val;
     getData();
   }
   let oldQueryValue;
   function onSearchQueryHandler() {
-    const isReset = !(isEmpty(oldQueryValue) && isEmpty(formModel.value.query) || oldQueryValue === formModel.value.query);
+    const isReset = !(isEmpty(oldQueryValue) && isEmpty(props.filterModel.query) || oldQueryValue === props.filterModel.query);
     getData(isReset ? 1 : null);
   }
   return {
-    formModel,
-    formColumns,
     totalElements,
     showFilter,
     getData,

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

@@ -1,4 +1,5 @@
 import { toRef } from 'vue';
+import { useAppSearch } from '../../appSearch/js/useAppSearch.mjs';
 import { isEmpty, isBoolean } from '../../../utils/is.mjs';
 import { useLocale } from '../../../hooks/useLocale.mjs';
 
@@ -73,9 +74,17 @@ const useAppTable = (config = {}) => {
   } catch (err) {
     console.error(err);
   }
+  const appSearchForm = useAppSearch(filterColumns, {
+    page: 1,
+    // 当前分页数
+    size: 15
+    // 每页数量
+  });
+  console.log("appSearchFormappSearchFormappSearchForm", appSearchForm);
   return {
     tableColumns: toRef(tableColumns),
-    filterColumns: toRef(filterColumns)
+    filterModel: appSearchForm.formModel,
+    filterColumns: appSearchForm.formColumns
   };
 };
 

package/es/version.mjs

@@ -1,3 +1,3 @@
-const version = "0.1.3";
+const version = "0.1.4";
 
 export { version };

package/lib/components/appTable/appTable.vue.js

@@ -5,14 +5,15 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var vue = require('vue');
 var elementPlus = require('element-plus');
 var iconsVue = require('@element-plus/icons-vue');
-var index$3 = require('../appTooltip/index.js');
-var index$1 = require('./js/index.js');
+var index$4 = require('../appTooltip/index.js');
+var index$2 = require('./js/index.js');
 var search = require('./js/search.js');
 var columnSelect = require('./cpns/columnSelect.vue.js');
 var useMixins = require('../../hooks/useMixins.js');
-var index = require('../appSearch/index.js');
+var index = require('../appButton/index.js');
+var index$1 = require('../appSearch/index.js');
 var adaptive = require('../../utils/adaptive.js');
-var index$2 = require('../appIconBox/index.js');
+var index$3 = require('../appIconBox/index.js');
 var useLocale = require('../../hooks/useLocale.js');
 var is = require('../../utils/is.js');
 
@@ -93,6 +94,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       default: "",
       required: false
     },
+    filterModel: {
+      type: Object,
+      default: () => ({})
+    },
     filterColumns: {
       // 表格筛选配置
       type: Array,
@@ -181,8 +186,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       onTableSelectHandler,
       // useAppTableSearch
       // 表单查询
-      formModel,
-      formColumns,
       totalElements,
       showFilter,
       getData,
@@ -204,7 +207,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         operatorDropdownRef,
         appSearchRef
       },
-      [index$1.useAppTableWrapper, search.useAppTableSearch]
+      [index$2.useAppTableWrapper, search.useAppTableSearch]
     );
     if (props.defaultGetData) {
       getData(1);
@@ -220,6 +223,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       clearSelectedList
     });
     return (_ctx, _cache) => {
+      const _component_AppIcon = vue.resolveComponent("AppIcon");
       return vue.openBlock(), vue.createElementBlock(
         "div",
         {
@@ -238,9 +242,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 "origin-columns": props.tableColumns,
                 onConfirm: vue.unref(onTableColumnsSelectHandler)
               }, null, 8, ["columns", "columns-editable", "origin-columns", "onConfirm"])) : vue.createCommentVNode("v-if", true),
-              vue.unref(formColumns).length > 0 ? (vue.openBlock(), vue.createElementBlock("div", {
+              __props.filterColumns.length > 0 ? (vue.openBlock(), vue.createElementBlock("div", {
                 key: 1,
-                class: "flex items-center gap-[10px] clickBox px-3 select-none rounded hover:bg-background-2",
+                class: "h-[32px] flex items-center gap-[10px] clickBox px-3 select-none rounded hover:bg-background-2",
                 onClick: vue.unref(switchShowFilter)
               }, [
                 vue.createVNode(vue.unref(elementPlus.ElIcon), { size: "12" }, {
@@ -260,8 +264,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
               ], 8, ["onClick"])) : vue.createCommentVNode("v-if", true),
               vue.unref(searchPlaceholder) ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElInput), {
                 key: 2,
-                modelValue: vue.unref(formModel).query,
-                "onUpdate:modelValue": ($event) => vue.unref(formModel).query = $event,
+                modelValue: __props.filterModel.query,
+                "onUpdate:modelValue": ($event) => __props.filterModel.query = $event,
                 class: "w-[160px]",
                 placeholder: vue.unref(t)("table.searchFor", [vue.unref(searchPlaceholder)]),
                 onKeydown: vue.withKeys(vue.unref(onSearchQueryHandler), ["enter"])
@@ -274,7 +278,21 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 ]),
                 _: 1
                 /* STABLE */
-              }, 8, ["modelValue", "onUpdate:modelValue", "placeholder", "onKeydown"])) : vue.createCommentVNode("v-if", true)
+              }, 8, ["modelValue", "onUpdate:modelValue", "placeholder", "onKeydown"])) : (vue.openBlock(), vue.createBlock(vue.unref(index.AppButton), {
+                key: 3,
+                type: "primary",
+                onClick: ($event) => vue.unref(getData)()
+              }, {
+                default: vue.withCtx(() => [
+                  vue.createVNode(_component_AppIcon, {
+                    class: "w-[12px] h-[12px]",
+                    "svg-name": "refres"
+                  })
+                ]),
+                _: 1
+                /* STABLE */
+              }, 8, ["onClick"])),
+              vue.renderSlot(_ctx.$slots, "operator-right-box")
             ]),
             _ctx.$slots["operator-left-box"] ? (vue.openBlock(), vue.createElementBlock("div", {
               key: 0,
@@ -284,12 +302,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             ])) : vue.createCommentVNode("v-if", true)
           ]),
           vue.createCommentVNode(" \u67E5\u8BE2\u8FC7\u6EE4 "),
-          vue.unref(formColumns).length > 0 ? (vue.openBlock(), vue.createBlock(vue.unref(index.AppSearch), {
+          __props.filterColumns.length > 0 ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.AppSearch), {
             key: 0,
             ref_key: "appSearchRef",
             ref: appSearchRef,
-            model: vue.unref(formModel),
-            columns: vue.unref(formColumns),
+            model: __props.filterModel,
+            columns: __props.filterColumns,
             hidden: !vue.unref(showFilter),
             class: vue.normalizeClass({ "mb-4": vue.unref(showFilter) }),
             onSearch: ($event) => vue.unref(getData)(1)
@@ -360,7 +378,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                 vue.renderSlot(_ctx.$slots, column.headerSlot, vue.mergeProps({ ref_for: true }, scope), () => {
                                   var _a2, _b;
                                   return [
-                                    !vue.unref(is.isEmpty)((_a2 = scope.column) == null ? void 0 : _a2.label) ? (vue.openBlock(), vue.createBlock(vue.unref(index$3.AppTooltip), {
+                                    !vue.unref(is.isEmpty)((_a2 = scope.column) == null ? void 0 : _a2.label) ? (vue.openBlock(), vue.createBlock(vue.unref(index$4.AppTooltip), {
                                       key: 0,
                                       "over-line": 1,
                                       content: (_b = scope.column) == null ? void 0 : _b.label
@@ -381,22 +399,22 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                       (vue.openBlock(true), vue.createElementBlock(
                                         vue.Fragment,
                                         null,
-                                        vue.renderList(vue.unref(index$1.operatorFilterHandler)(
+                                        vue.renderList(vue.unref(index$2.operatorFilterHandler)(
                                           column,
                                           scope,
                                           "default"
                                         ), (citem, cindex) => {
-                                          return vue.openBlock(), vue.createBlock(vue.unref(index$2.AppIconBox), {
+                                          return vue.openBlock(), vue.createBlock(vue.unref(index$3.AppIconBox), {
                                             key: cindex,
                                             "svg-name": citem.svgName,
                                             altText: citem.label,
-                                            onClick: vue.withModifiers(($event) => vue.unref(index$1.operatorClickHandler)(cindex, column, scope, "default"), ["stop"])
+                                            onClick: vue.withModifiers(($event) => vue.unref(index$2.operatorClickHandler)(cindex, column, scope, "default"), ["stop"])
                                           }, null, 8, ["svg-name", "altText", "onClick"]);
                                         }),
                                         128
                                         /* KEYED_FRAGMENT */
                                       )),
-                                      ((_a2 = vue.unref(index$1.operatorFilterHandler)(column, scope, "more")) == null ? void 0 : _a2.length) ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElDropdown), {
+                                      ((_a2 = vue.unref(index$2.operatorFilterHandler)(column, scope, "more")) == null ? void 0 : _a2.length) ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElDropdown), {
                                         key: 0,
                                         ref_for: true,
                                         ref_key: "operatorDropdownRef",
@@ -405,7 +423,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                         class: "ml-3",
                                         "popper-style": "min-width: 150px",
                                         placement: "bottom",
-                                        onCommand: ($event) => vue.unref(index$1.operatorClickHandler)($event, column, scope, "more")
+                                        onCommand: ($event) => vue.unref(index$2.operatorClickHandler)($event, column, scope, "more")
                                       }, {
                                         dropdown: vue.withCtx(() => [
                                           vue.createVNode(
@@ -416,7 +434,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                                 (vue.openBlock(true), vue.createElementBlock(
                                                   vue.Fragment,
                                                   null,
-                                                  vue.renderList(vue.unref(index$1.operatorFilterHandler)(
+                                                  vue.renderList(vue.unref(index$2.operatorFilterHandler)(
                                                     column,
                                                     scope,
                                                     "more"
@@ -424,7 +442,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$1.operatorDisabledHandler)(citem, scope)
+                                                      disabled: vue.unref(index$2.operatorDisabledHandler)(citem, scope)
                                                     }, {
                                                       default: vue.withCtx(() => [
                                                         vue.createElementVNode("span", null, [
@@ -435,13 +453,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                                             1
                                                             /* TEXT */
                                                           ),
-                                                          vue.unref(index$1.operatorDisabledHandler)(citem, scope) ? (vue.openBlock(), vue.createElementBlock(
+                                                          vue.unref(index$2.operatorDisabledHandler)(citem, scope) ? (vue.openBlock(), vue.createElementBlock(
                                                             "span",
                                                             {
                                                               key: 0,
                                                               class: "text-xs leading-1"
                                                             },
-                                                            "\uFF08" + vue.toDisplayString(vue.unref(index$1.operatorDisableTextdHandler)(citem, scope)) + "\uFF09",
+                                                            "\uFF08" + vue.toDisplayString(vue.unref(index$2.operatorDisableTextdHandler)(citem, scope)) + "\uFF09",
                                                             1
                                                             /* TEXT */
                                                           )) : vue.createCommentVNode("v-if", true)
@@ -463,7 +481,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                           )
                                         ]),
                                         default: vue.withCtx(() => [
-                                          vue.createVNode(vue.unref(index$2.AppIconBox), {
+                                          vue.createVNode(vue.unref(index$3.AppIconBox), {
                                             key: "more",
                                             "svg-name": "system-burst_analysis_select_option",
                                             altText: vue.unref(t)("table.moreOperations"),
@@ -481,7 +499,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                     vue.Fragment,
                                     { key: 2 },
                                     [
-                                      !vue.unref(is.isEmpty)(scope.row[scope.column.property]) ? (vue.openBlock(), vue.createBlock(vue.unref(index$3.AppTooltip), {
+                                      !vue.unref(is.isEmpty)(scope.row[scope.column.property]) ? (vue.openBlock(), vue.createBlock(vue.unref(index$4.AppTooltip), {
                                         key: 0,
                                         "over-line": 2,
                                         content: scope.row[scope.column.property]
@@ -527,10 +545,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 /* TEXT */
               ),
               vue.createVNode(vue.unref(elementPlus.ElPagination), {
-                "current-page": vue.unref(formModel).page,
-                "onUpdate:currentPage": ($event) => vue.unref(formModel).page = $event,
-                "page-size": vue.unref(formModel).size,
-                "onUpdate:pageSize": ($event) => vue.unref(formModel).size = $event,
+                "current-page": __props.filterModel.page,
+                "onUpdate:currentPage": ($event) => __props.filterModel.page = $event,
+                "page-size": __props.filterModel.size,
+                "onUpdate:pageSize": ($event) => __props.filterModel.size = $event,
                 total: vue.unref(totalElements),
                 "pager-count": __props.pagerCount,
                 "page-sizes": [10, 15, 30, 50, 100],
@@ -556,7 +574,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             "virtual-triggering": "",
             trigger: "contextmenu",
             placement: "bottom",
-            onCommand: ($event) => vue.unref(index$1.operatorClickHandler)(
+            onCommand: ($event) => vue.unref(index$2.operatorClickHandler)(
               $event,
               vue.unref(tableTriggerRef).column,
               vue.unref(tableTriggerRef).scope
@@ -568,14 +586,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   (vue.openBlock(true), vue.createElementBlock(
                     vue.Fragment,
                     null,
-                    vue.renderList(vue.unref(index$1.operatorFilterHandler)(
+                    vue.renderList(vue.unref(index$2.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$1.operatorDisabledHandler)(citem, vue.unref(tableTriggerRef).scope)
+                        disabled: vue.unref(index$2.operatorDisabledHandler)(citem, vue.unref(tableTriggerRef).scope)
                       }, {
                         default: vue.withCtx(() => [
                           vue.createElementVNode("span", null, [
@@ -586,13 +604,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                               1
                               /* TEXT */
                             ),
-                            vue.unref(index$1.operatorDisabledHandler)(citem, vue.unref(tableTriggerRef).scope) ? (vue.openBlock(), vue.createElementBlock(
+                            vue.unref(index$2.operatorDisabledHandler)(citem, vue.unref(tableTriggerRef).scope) ? (vue.openBlock(), vue.createElementBlock(
                               "span",
                               {
                                 key: 0,
                                 class: "text-xs leading-1"
                               },
-                              "\uFF08" + vue.toDisplayString(vue.unref(index$1.operatorDisableTextdHandler)(citem, vue.unref(tableTriggerRef).scope)) + "\uFF09",
+                              "\uFF08" + vue.toDisplayString(vue.unref(index$2.operatorDisableTextdHandler)(citem, vue.unref(tableTriggerRef).scope)) + "\uFF09",
                               1
                               /* TEXT */
                             )) : vue.createCommentVNode("v-if", true)

package/lib/components/appTable/js/search.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var vue = require('vue');
-var useAppSearch = require('../../appSearch/js/useAppSearch.js');
 var useApi = require('../../../hooks/useApi.js');
 var is = require('../../../utils/is.js');
 
@@ -16,12 +15,6 @@ function useAppTableSearch(hy) {
     clearSelection
   } = hy;
   const { api } = useApi.useApi();
-  const { formModel, formColumns } = useAppSearch.useAppSearch(props.filterColumns, {
-    page: 1,
-    // 当前分页数
-    size: 15
-    // 每页数量
-  });
   const totalElements = vue.ref(0);
   const showFilter = vue.ref(true);
   function switchShowFilter() {
@@ -33,7 +26,7 @@ function useAppTableSearch(hy) {
     return new Promise((resolve, reject) => {
       if (!is.isEmpty(page)) {
         if (is.isNumber(page) || is.isString(page)) {
-          formModel.value.page = page;
+          props.filterModel.page = page;
         }
       }
       const params = getParametersFn();
@@ -55,7 +48,7 @@ function useAppTableSearch(hy) {
     });
     function successFun(res) {
       var _a;
-      if (!((_a = res.data.content) == null ? void 0 : _a.length) && formModel.value.page !== 1) {
+      if (!((_a = res.data.content) == null ? void 0 : _a.length) && props.filterModel.page !== 1) {
         getData(1);
         return;
       }
@@ -72,14 +65,14 @@ function useAppTableSearch(hy) {
   async function resetFn() {
     await vue.nextTick();
     appSearchRef.value.resetFields();
-    formModel.value.query = null;
+    props.filterModel.query = null;
     getData(1);
   }
   function getParametersFn() {
     return Object.assign(
       {
-        ...vue.unref(formModel),
-        page: vue.unref(formModel).page - 1
+        ...props.filterModel,
+        page: props.filterModel.page - 1
       },
       vue.unref(props.requestParams)
     );
@@ -95,22 +88,20 @@ function useAppTableSearch(hy) {
     closeAppTableLoading();
   }
   function onSizeChangeHandler(val) {
-    formModel.value.page = 1;
-    formModel.value.size = val;
+    props.filterModel.page = 1;
+    props.filterModel.size = val;
     getData();
   }
   function onCurrentChangeHandler(val) {
-    formModel.value.page = val;
+    props.filterModel.page = val;
     getData();
   }
   let oldQueryValue;
   function onSearchQueryHandler() {
-    const isReset = !(is.isEmpty(oldQueryValue) && is.isEmpty(formModel.value.query) || oldQueryValue === formModel.value.query);
+    const isReset = !(is.isEmpty(oldQueryValue) && is.isEmpty(props.filterModel.query) || oldQueryValue === props.filterModel.query);
     getData(isReset ? 1 : null);
   }
   return {
-    formModel,
-    formColumns,
     totalElements,
     showFilter,
     getData,

package/lib/components/appTable/js/useAppTable.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var vue = require('vue');
+var useAppSearch = require('../../appSearch/js/useAppSearch.js');
 var is = require('../../../utils/is.js');
 var useLocale = require('../../../hooks/useLocale.js');
 
@@ -75,9 +76,17 @@ const useAppTable = (config = {}) => {
   } catch (err) {
     console.error(err);
   }
+  const appSearchForm = useAppSearch.useAppSearch(filterColumns, {
+    page: 1,
+    // 当前分页数
+    size: 15
+    // 每页数量
+  });
+  console.log("appSearchFormappSearchFormappSearchForm", appSearchForm);
   return {
     tableColumns: vue.toRef(tableColumns),
-    filterColumns: vue.toRef(filterColumns)
+    filterModel: appSearchForm.formModel,
+    filterColumns: appSearchForm.formColumns
   };
 };
 

package/lib/version.js

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

package/package.json

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