hy-dispatch-ui-v3 0.2.44 → 0.2.46

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, useModel, useTemplateRef, openBlock, createElementBlock, createCommentVNode, createElementVNode, createBlock, unref, createVNode, withCtx, toDisplayString, renderSlot, normalizeClass, createSlots, renderList, normalizeProps, guardReactiveProps, mergeProps, Fragment, withModifiers, mergeModels } 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';
@@ -21,7 +22,7 @@ const __default__ = defineComponent({
   name: "HyTable"
 });
 const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
-  props: {
+  props: /* @__PURE__ */ mergeModels({
     // 表格配置项
     type: {
       type: String,
@@ -81,6 +82,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: Boolean,
       default: true
     },
+    loadingTimeout: {
+      // 加载超时
+      type: Number,
+      default: 60 * 1e3
+    },
     showEditable: {
       type: Boolean,
       default: true
@@ -184,17 +190,21 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       // 展开回调
       type: Function
     }
-  },
-  emits: [
+  }, {
+    "loading": { type: Boolean, default: false },
+    "loadingModifiers": {}
+  }),
+  emits: /* @__PURE__ */ mergeModels([
     "row-click",
     "select-all",
     "on-select-checkbox",
     "reqSuccess",
     "search-data"
-  ],
+  ], ["update:loading"]),
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emits = __emit;
+    const loading = useModel(__props, "loading");
     const { t } = useLocale();
     const containerRef = useTemplateRef("containerRef");
     const tableRef = useTemplateRef("tableRef");
@@ -243,6 +253,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       {
         props,
         emits,
+        loading,
         containerRef,
         tableRef,
         tableDropdownRef,
@@ -280,7 +291,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),
@@ -320,44 +331,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/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.43";
+const version = "0.2.45";
 
 export { version };

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

@@ -37,6 +37,10 @@ const _sfc_main = {
       type: Boolean,
       default: false
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     readonly: {
       type: Boolean,
       default: false
@@ -252,6 +256,7 @@ const _sfc_main = {
                               "parent-prop": __props.column.field,
                               index: index$1,
                               loading: __props.loading,
+                              disabled: __props.disabled,
                               readonly: __props.readonly,
                               level: 3
                             }, vue.createSlots({
@@ -266,7 +271,7 @@ const _sfc_main = {
                                   ])
                                 };
                               })
-                            ]), 1032, ["model", "column", "rules", "parent-prop", "index", "loading", "readonly"]);
+                            ]), 1032, ["model", "column", "rules", "parent-prop", "index", "loading", "disabled", "readonly"]);
                           }),
                           128
                           /* KEYED_FRAGMENT */

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

@@ -32,6 +32,10 @@ const _sfc_main = {
       type: Boolean,
       default: false
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     readonly: {
       type: Boolean,
       default: false
@@ -115,6 +119,7 @@ const _sfc_main = {
                       column: item,
                       rules: __props.rules,
                       loading: __props.loading,
+                      disabled: __props.disabled,
                       readonly: __props.readonly
                     }, vue.createSlots({
                       _: 2
@@ -128,7 +133,7 @@ const _sfc_main = {
                           ])
                         };
                       })
-                    ]), 1032, ["model", "column", "rules", "loading", "readonly"]);
+                    ]), 1032, ["model", "column", "rules", "loading", "disabled", "readonly"]);
                   }),
                   128
                   /* KEYED_FRAGMENT */

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

@@ -40,6 +40,10 @@ const _sfc_main = {
       type: Boolean,
       default: false
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     readonly: {
       type: Boolean,
       default: false
@@ -231,20 +235,20 @@ const _sfc_main = {
                     end: bindValue2.value,
                     "onUpdate:end": ($event) => bindValue2.value = $event,
                     "is-range": true,
-                    style: { "width": "100%" }
+                    style: { "width": "100%" },
+                    teleported: false
                   }, __props.column.attrs, {
                     disabled: vue.unref(index.isDisabled)(props, __props.column),
-                    teleported: false,
                     onChange: onChangeHandler
                   }), null, 16, ["start", "onUpdate:start", "end", "onUpdate:end", "disabled"])) : (vue.openBlock(), vue.createBlock(vue.unref(index$3.HyDatePicker), vue.mergeProps({
                     key: 1,
                     modelValue: bindValue.value,
                     "onUpdate:modelValue": ($event) => bindValue.value = $event,
                     "is-range": false,
-                    style: { "width": "100%" }
+                    style: { "width": "100%" },
+                    teleported: false
                   }, __props.column.attrs, {
                     disabled: vue.unref(index.isDisabled)(props, __props.column),
-                    teleported: false,
                     onChange: onChangeHandler
                   }), null, 16, ["modelValue", "onUpdate:modelValue", "disabled"]))
                 ],
@@ -262,20 +266,20 @@ const _sfc_main = {
                     end: bindValue2.value,
                     "onUpdate:end": ($event) => bindValue2.value = $event,
                     "is-range": true,
-                    style: { "width": "100%" }
+                    style: { "width": "100%" },
+                    teleported: false
                   }, __props.column.attrs, {
                     disabled: vue.unref(index.isDisabled)(props, __props.column),
-                    teleported: false,
                     onChange: onChangeHandler
                   }), null, 16, ["start", "onUpdate:start", "end", "onUpdate:end", "disabled"])) : (vue.openBlock(), vue.createBlock(vue.unref(index$4.HyTimePicker), vue.mergeProps({
                     key: 1,
                     modelValue: bindValue.value,
                     "onUpdate:modelValue": ($event) => bindValue.value = $event,
                     "is-range": false,
-                    style: { "width": "100%" }
+                    style: { "width": "100%" },
+                    teleported: false
                   }, __props.column.attrs, {
                     disabled: vue.unref(index.isDisabled)(props, __props.column),
-                    teleported: false,
                     onChange: onChangeHandler
                   }), null, 16, ["modelValue", "onUpdate:modelValue", "disabled"]))
                 ],

package/lib/components/hyForm/form.vue.js

@@ -39,7 +39,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: Boolean,
       default: false
     },
-    loading: {
+    disabled: {
       type: Boolean,
       default: false
     },
@@ -172,7 +172,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                             column,
                             rules: __props.rules,
                             columnNum: __props.columnNum,
-                            loading: __props.loading,
+                            loading: _ctx.loading,
+                            disabled: __props.disabled,
                             readonly: __props.readonly,
                             style: vue.normalizeStyle(vue.unref(index.columnItemStyle)(props, column))
                           }, vue.createSlots({
@@ -187,7 +188,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                 ])
                               };
                             })
-                          ]), 1032, ["model", "column", "rules", "columnNum", "loading", "readonly", "style"])) : vue.createCommentVNode("v-if", true)
+                          ]), 1032, ["model", "column", "rules", "columnNum", "loading", "disabled", "readonly", "style"])) : vue.createCommentVNode("v-if", true)
                         ],
                         64
                         /* STABLE_FRAGMENT */
@@ -202,7 +203,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                             column,
                             rules: __props.rules,
                             columnNum: __props.columnNum,
-                            loading: __props.loading,
+                            loading: _ctx.loading,
+                            disabled: __props.disabled,
                             readonly: __props.readonly,
                             size: __props.size,
                             style: vue.normalizeStyle(vue.unref(index.columnItemStyle)(props, column))
@@ -218,7 +220,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                 ])
                               };
                             })
-                          ]), 1032, ["model", "column", "rules", "columnNum", "loading", "readonly", "size", "style"])) : vue.createCommentVNode("v-if", true)
+                          ]), 1032, ["model", "column", "rules", "columnNum", "loading", "disabled", "readonly", "size", "style"])) : vue.createCommentVNode("v-if", true)
                         ],
                         64
                         /* STABLE_FRAGMENT */
@@ -231,7 +233,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                             model: __props.model,
                             column,
                             rules: __props.rules,
-                            loading: __props.loading,
+                            loading: _ctx.loading,
+                            disabled: __props.disabled,
                             readonly: __props.readonly
                           }, vue.createSlots({
                             _: 2
@@ -245,7 +248,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                 ])
                               };
                             })
-                          ]), 1032, ["model", "column", "rules", "loading", "readonly"])
+                          ]), 1032, ["model", "column", "rules", "loading", "disabled", "readonly"])
                         ],
                         64
                         /* STABLE_FRAGMENT */

package/lib/components/hyForm/js/index.js

@@ -46,7 +46,7 @@ function isRequired(props, column) {
   return false;
 }
 function isDisabled(props, column) {
-  if (props.loading) return true;
+  if (props.disabled || props.loading) return true;
   const disabled = vue.unref(column.attrs?.disabled);
   if (is.isBoolean(disabled)) return disabled;
   if (is.isFunction(disabled)) return disabled(column, props.model);

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/cpns/searchItem.vue.js

@@ -22,6 +22,14 @@ const _sfc_main = {
     column: {
       type: Object,
       default: () => ({})
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    },
+    disabled: {
+      type: Boolean,
+      default: false
     }
   },
   emits: ["search"],

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

@@ -37,7 +37,7 @@ function columnShowHandler(props, column) {
   return true;
 }
 function isDisabled(props, column) {
-  if (props.loading) return true;
+  if (props.disabled || props.loading) return true;
   const disabled = vue.unref(column.attrs?.disabled);
   if (is.isBoolean(disabled)) return disabled;
   if (is.isFunction(disabled)) return disabled(column, props.model);

package/lib/components/hySearch/search.vue.js

@@ -30,6 +30,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: Boolean,
       default: false
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: "default"
@@ -207,7 +211,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             model: __props.model,
             "label-position": "top",
             size: __props.size,
-            class: "hy-search-form"
+            class: "hy-search-form",
+            disabled: __props.disabled
           }, _ctx.$attrs, { style: containerStyle.value }), {
             default: vue.withCtx(() => [
               vue.createElementVNode(
@@ -227,6 +232,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                         key: column.key,
                         model: __props.model,
                         column,
+                        loading: __props.loading,
+                        disabled: __props.disabled,
                         onSearch: onSearchHandler
                       }, vue.createSlots({
                         _: 2
@@ -240,7 +247,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                             ])
                           };
                         })
-                      ]), 1032, ["model", "column"]);
+                      ]), 1032, ["model", "column", "loading", "disabled"]);
                     }),
                     128
                     /* KEYED_FRAGMENT */
@@ -252,7 +259,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             ]),
             _: 3
             /* FORWARDED */
-          }, 16, ["model", "size", "style"])
+          }, 16, ["model", "size", "disabled", "style"])
         ],
         2
         /* CLASS */

package/lib/components/hyTable/js/index.js

@@ -154,7 +154,6 @@ const useAppTableWrapper = (hy) => {
   const { permissionMap } = usePermissionMap.usePermissionMap();
   const { t } = useLocale.useLocale();
   const CACHE_COLUMNS_KEY = props.controller || props.url || "CACHE_COLUMNS_KEY";
-  const loading = vue.ref(true);
   const tableDataSource = vue.ref([]);
   const tableColumns = vue.ref([]);
   const tableColumnsEditablele = vue.ref({});
@@ -211,13 +210,24 @@ const useAppTableWrapper = (hy) => {
     });
     loadingTimer = setTimeout(() => {
       closeAppTableLoading();
-    }, 60 * 1e3);
+    }, props.loadingTimeout);
   }
   function closeAppTableLoading() {
     loadingTimer && clearTimeout(loadingTimer);
     loadingInstance?.close();
     loadingInstance = null;
   }
+  vue.watch(
+    () => hy.loading.value,
+    (value) => {
+      if (value) {
+        showAppTableLoading();
+      } else {
+        closeAppTableLoading();
+      }
+    },
+    { immediate: true }
+  );
   const tableTriggerPosition = vue.ref({
     top: 0,
     left: 0,
@@ -363,15 +373,12 @@ const useAppTableWrapper = (hy) => {
   });
   return {
     // 表格配置项
-    loading,
     tableDataSource,
     tableColumns,
     tableColumnsEditablele,
     tableColumnsList,
     searchPlaceholder,
     doLayout,
-    showAppTableLoading,
-    closeAppTableLoading,
     // 表格行操作配置
     getRowKey,
     selectedList,