hy-dispatch-ui-v3 0.1.2 → 0.1.4

package/lib/components/appSearch/appSearch.vue.js

@@ -5,7 +5,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var vue = require('vue');
 var elementPlus = require('element-plus');
 var iconsVue = require('@element-plus/icons-vue');
-var appDatePicker = require('../appDatePicker/appDatePicker.vue.js');
+var index$1 = require('../appDatePicker/index.js');
+var index$2 = require('../appOrgCascader/index.js');
 var index = require('./js/index.js');
 var useAppSearch = require('./js/useAppSearch.js');
 var useLocale = require('../../hooks/useLocale.js');
@@ -314,7 +315,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                                 "daterange",
                                                 "monthrange",
                                                 "yearrange"
-                                              ].includes((_a = column.attrs) == null ? void 0 : _a.type) && vue.unref(is.isArray)(column.field) ? (vue.openBlock(), vue.createBlock(appDatePicker.default, vue.mergeProps({
+                                              ].includes((_a = column.attrs) == null ? void 0 : _a.type) && vue.unref(is.isArray)(column.field) ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.AppDatePicker), vue.mergeProps({
                                                 key: 0,
                                                 start: __props.model[column.field[0]],
                                                 "onUpdate:start": ($event) => __props.model[column.field[0]] = $event,
@@ -326,7 +327,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                                 disabled: vue.unref(index.isDisabled)(props, column),
                                                 timeRangeFill: column.timeRangeFill,
                                                 onChange: ($event) => onChangeHandler($event, column)
-                                              }), null, 16, ["start", "onUpdate:start", "end", "onUpdate:end", "disabled", "timeRangeFill", "onChange"])) : (vue.openBlock(), vue.createBlock(appDatePicker.default, vue.mergeProps({
+                                              }), null, 16, ["start", "onUpdate:start", "end", "onUpdate:end", "disabled", "timeRangeFill", "onChange"])) : (vue.openBlock(), vue.createBlock(vue.unref(index$1.AppDatePicker), vue.mergeProps({
                                                 key: 1,
                                                 modelValue: __props.model[column.field],
                                                 "onUpdate:modelValue": ($event) => __props.model[column.field] = $event,
@@ -340,6 +341,19 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                             ],
                                             64
                                             /* STABLE_FRAGMENT */
+                                          )) : column.type === "org-cascader" ? (vue.openBlock(), vue.createElementBlock(
+                                            vue.Fragment,
+                                            { key: 4 },
+                                            [
+                                              vue.createCommentVNode(" \u90E8\u95E8\u7EA7\u8054\u9009\u62E9\u6846 "),
+                                              vue.createVNode(vue.unref(index$2.AppOrgCascader), vue.mergeProps({
+                                                modelValue: __props.model[column.field],
+                                                "onUpdate:modelValue": ($event) => __props.model[column.field] = $event,
+                                                disabled: vue.unref(index.isDisabled)(props, column)
+                                              }, { ref_for: true }, column.attrs), null, 16, ["modelValue", "onUpdate:modelValue", "disabled"])
+                                            ],
+                                            2112
+                                            /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
                                           )) : vue.createCommentVNode("v-if", true)
                                         ],
                                         4
@@ -356,10 +370,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                     (vue.openBlock(true), vue.createElementBlock(
                                       vue.Fragment,
                                       null,
-                                      vue.renderList(column.timeRangeOptions, (item, index) => {
+                                      vue.renderList(column.timeRangeOptions, (item, index$1) => {
                                         return vue.openBlock(), vue.createElementBlock("div", {
-                                          key: index,
-                                          class: "border-l border-border px-[10px] cursor-pointer",
+                                          key: index$1,
+                                          class: vue.normalizeClass(["border-l border-border px-[10px] cursor-pointer", {
+                                            "bg-[rgba(var(--hy-theme),0.2)] text-theme font-bold": vue.unref(index.isSelectedTimeRange)(column, item, __props.model)
+                                          }]),
                                           onClick: ($event) => onTimeRangeClickHandler(column, item)
                                         }, [
                                           vue.createElementVNode(
@@ -369,7 +385,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                             1
                                             /* TEXT */
                                           )
-                                        ], 8, ["onClick"]);
+                                        ], 10, ["onClick"]);
                                       }),
                                       128
                                       /* KEYED_FRAGMENT */

package/lib/components/appSearch/js/index.js

@@ -90,9 +90,10 @@ function useShrink(props, templateRef) {
 }
 function timeRangeHandler(column, options) {
   const { value, unit } = options;
-  const { timeRangeFill, attrs } = column;
-  const format = attrs.valueFormat || "YYYY-MM-DD";
+  let { timeRangeFill, attrs } = column;
+  const format = "YYYY-MM-DD";
   const date = dayjs(Date.now());
+  timeRangeFill = timeRangeFill || attrs.type === "datetimerange";
   switch (unit) {
     case "year":
     case "month":
@@ -111,11 +112,20 @@ function timeRangeHandler(column, options) {
       ];
   }
 }
+function isSelectedTimeRange(column, options, model = {}) {
+  const [start, end] = timeRangeHandler(column, options);
+  const { field } = column;
+  if (Array.isArray(field)) {
+    return start === model[field[0]] && end === model[field[1]];
+  }
+  return start === model[field][0] && end === model[field][1];
+}
 
 exports.columnItemInputStyle = columnItemInputStyle;
 exports.columnItemStyle = columnItemStyle;
 exports.columnShowHandler = columnShowHandler;
 exports.isDisabled = isDisabled;
 exports.isEmptyValue = isEmptyValue;
+exports.isSelectedTimeRange = isSelectedTimeRange;
 exports.timeRangeHandler = timeRangeHandler;
 exports.useShrink = useShrink;

package/lib/components/appSearch/js/useAppSearch.js

@@ -6,6 +6,15 @@ var date = require('../../../utils/date.js');
 var useLocale = require('../../../hooks/useLocale.js');
 var is = require('../../../utils/is.js');
 
+const genDefaultLabel = (config) => {
+  if (config.label) return config.label;
+  const { t } = useLocale.useLocale();
+  switch (config.type) {
+    // 部门级联选择框
+    case "org-cascader":
+      return t("form.department");
+  }
+};
 const genPlaceholderHandler = (config) => {
   const { t } = useLocale.useLocale();
   const { type, label, attrs = {} } = config || {};
@@ -96,7 +105,8 @@ const timeRangeOptionsHandler = (config) => {
   }, []);
 };
 function appSearchItemHandler(column = {}) {
-  const { placeholder, startPlaceholder, endPlaceholder } = genPlaceholderHandler(column);
+  const label = genDefaultLabel(column);
+  const { placeholder, startPlaceholder, endPlaceholder } = genPlaceholderHandler({ ...column, label });
   const attrs = {
     clearable: true,
     ...column.attrs || {},
@@ -108,6 +118,7 @@ function appSearchItemHandler(column = {}) {
     {
       key: /* @__PURE__ */ Symbol("appFormItemKey"),
       field: column.prop,
+      label,
       readonly: column.readonly || false,
       width,
       inputWidth,

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,
@@ -174,13 +179,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       tableTriggerRef,
       getSelectedList,
       setTableRowClassName,
+      clearSelection,
+      clearSelectedList,
       onTableRowClickHandler,
       onTableRowContextmenuHandler,
-      onTableSelectAllHandler,
+      onTableSelectHandler,
       // useAppTableSearch
       // 表单查询
-      formModel,
-      formColumns,
       totalElements,
       showFilter,
       getData,
@@ -202,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);
@@ -213,9 +218,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       resetFn,
       getSelectedList,
       getTotalElements,
-      getTableDataSource
+      getTableDataSource,
+      clearSelection,
+      clearSelectedList
     });
     return (_ctx, _cache) => {
+      const _component_AppIcon = vue.resolveComponent("AppIcon");
       return vue.openBlock(), vue.createElementBlock(
         "div",
         {
@@ -234,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" }, {
@@ -256,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"])
@@ -270,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,
@@ -280,16 +302,28 @@ 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)
-          }, null, 8, ["model", "columns", "hidden", "class", "onSearch"])) : vue.createCommentVNode("v-if", true),
+          }, 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)))
+                ])
+              };
+            })
+          ]), 1032, ["model", "columns", "hidden", "class", "onSearch"])) : vue.createCommentVNode("v-if", true),
           vue.createCommentVNode(" \u4E3B\u5185\u5BB9 "),
           vue.createElementVNode("div", { class: "h-0 flex-1 flex flex-col border border-border rounded pb-5 overflow-hidden" }, [
             vue.renderSlot(_ctx.$slots, "table", { data: vue.unref(tableDataSource) }, () => [
@@ -305,7 +339,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 style: {
                   "font-size": `${vue.unref(adaptive.parseRem)(__props.fontSize)}rem`
                 },
-                onSelectAll: vue.unref(onTableSelectAllHandler),
+                onSelect: vue.unref(onTableSelectHandler),
+                onSelectAll: vue.unref(onTableSelectHandler),
                 onRowClick: vue.unref(onTableRowClickHandler),
                 onRowContextmenu: vue.unref(onTableRowContextmenuHandler)
               }, _ctx.$attrs), {
@@ -343,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
@@ -364,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",
@@ -388,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(
@@ -399,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"
@@ -407,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, [
@@ -418,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)
@@ -446,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"),
@@ -464,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]
@@ -495,7 +530,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 ]),
                 _: 3
                 /* FORWARDED */
-              }, 16, ["row-key", "data", "show-header", "row-class-name", "class", "style", "onSelectAll", "onRowClick", "onRowContextmenu"])
+              }, 16, ["row-key", "data", "show-header", "row-class-name", "class", "style", "onSelect", "onSelectAll", "onRowClick", "onRowContextmenu"])
             ]),
             vue.createCommentVNode(" \u5206\u9875 "),
             __props.showPagination ? (vue.openBlock(), vue.createElementBlock("div", {
@@ -510,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],
@@ -539,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
@@ -551,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, [
@@ -569,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/index.js

@@ -252,13 +252,27 @@ const useAppTableWrapper = (hy) => {
       emits("on-select-checkbox", selectedList.value, row);
     }
   }
-  function onTableSelectAllHandler(selectList = [], row) {
+  function onTableSelectHandler(selectList = [], row) {
     if (selectList.length === 0 && tableDataSource.value.length === 0) {
-      tableRef.value.clearSelection();
+      clearSelection();
     }
     selectedList.value = [...selectList];
     emits("on-select-checkbox", [...selectList], row);
   }
+  function clearSelectedList(list = []) {
+    selectedList.value = list || [];
+    clearSelection();
+    list.forEach((row) => {
+      const item = tableDataSource.value.find(
+        (v) => getRowKey(row) === getRowKey(v)
+      );
+      if (item) {
+        tableRef.value.toggleRowSelection(item, true);
+      } else {
+        tableRef.value.toggleRowSelection(row, true);
+      }
+    });
+  }
   function setTableRowClassName(obj) {
     const row = obj.row;
     let className = [];
@@ -295,12 +309,13 @@ const useAppTableWrapper = (hy) => {
     selectedList,
     tableTriggerRef,
     setTableRowClassName,
-    onTableSelectAllHandler,
+    getSelectedList,
+    clearSelection,
+    clearSelectedList,
+    onTableSelectHandler,
     onTableRowContextmenuHandler,
     onTableRowClickHandler,
-    onTableColumnsSelectHandler,
-    getSelectedList,
-    clearSelection
+    onTableColumnsSelectHandler
   };
 };
 

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();
@@ -42,13 +35,11 @@ function useAppTableSearch(hy) {
         vue.unref(api).post(`${props.controller}/page`, params, options).then(successFun).finally(() => {
           resolve();
           closeAppTableLoading();
-          clearSelection();
         });
       } else if (props.url) {
         vue.unref(api).post(props.url, params, options).then(successFun).finally(() => {
           resolve();
           closeAppTableLoading();
-          clearSelection();
         });
       } else {
         closeAppTableLoading();
@@ -57,11 +48,10 @@ 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;
       }
-      console.log("res", res);
       const data = res.data.content ? res.data.content : res.data || [];
       if (props.beforeDataHandler) {
         tableDataSource.value = props.beforeDataHandler(data);
@@ -75,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)
     );
@@ -98,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,