hy-dispatch-ui-v3 0.2.45 → 0.2.47

package/es/components/hyForm/cpns/arrayItem.vue.mjs

@@ -33,6 +33,10 @@ const _sfc_main = {
       type: Boolean,
       default: false
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     readonly: {
       type: Boolean,
       default: false
@@ -248,6 +252,7 @@ const _sfc_main = {
                               "parent-prop": __props.column.field,
                               index,
                               loading: __props.loading,
+                              disabled: __props.disabled,
                               readonly: __props.readonly,
                               level: 3
                             }, createSlots({
@@ -262,7 +267,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/es/components/hyForm/cpns/extraItem.vue.mjs

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

package/es/components/hyForm/cpns/formItem.vue.mjs

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

package/es/components/hyForm/form.vue.mjs

@@ -39,6 +39,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: Boolean,
       default: false
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: "default"
@@ -169,6 +173,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                             rules: __props.rules,
                             columnNum: __props.columnNum,
                             loading: __props.loading,
+                            disabled: __props.disabled,
                             readonly: __props.readonly,
                             style: normalizeStyle(unref(columnItemStyle)(props, column))
                           }, createSlots({
@@ -183,7 +188,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                 ])
                               };
                             })
-                          ]), 1032, ["model", "column", "rules", "columnNum", "loading", "readonly", "style"])) : createCommentVNode("v-if", true)
+                          ]), 1032, ["model", "column", "rules", "columnNum", "loading", "disabled", "readonly", "style"])) : createCommentVNode("v-if", true)
                         ],
                         64
                         /* STABLE_FRAGMENT */
@@ -199,6 +204,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                             rules: __props.rules,
                             columnNum: __props.columnNum,
                             loading: __props.loading,
+                            disabled: __props.disabled,
                             readonly: __props.readonly,
                             size: __props.size,
                             style: normalizeStyle(unref(columnItemStyle)(props, column))
@@ -214,7 +220,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                 ])
                               };
                             })
-                          ]), 1032, ["model", "column", "rules", "columnNum", "loading", "readonly", "size", "style"])) : createCommentVNode("v-if", true)
+                          ]), 1032, ["model", "column", "rules", "columnNum", "loading", "disabled", "readonly", "size", "style"])) : createCommentVNode("v-if", true)
                         ],
                         64
                         /* STABLE_FRAGMENT */
@@ -228,6 +234,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                             column,
                             rules: __props.rules,
                             loading: __props.loading,
+                            disabled: __props.disabled,
                             readonly: __props.readonly
                           }, createSlots({
                             _: 2
@@ -241,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/es/components/hyForm/js/index.mjs

@@ -44,7 +44,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 = unref(column.attrs?.disabled);
   if (isBoolean(disabled)) return disabled;
   if (isFunction(disabled)) return disabled(column, props.model);

package/es/components/hySearch/cpns/searchItem.vue.mjs

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

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

@@ -35,7 +35,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 = unref(column.attrs?.disabled);
   if (isBoolean(disabled)) return disabled;
   if (isFunction(disabled)) return disabled(column, props.model);

package/es/components/hySearch/search.vue.mjs

@@ -26,6 +26,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: Boolean,
       default: false
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: "default"
@@ -203,7 +207,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: withCtx(() => [
               createElementVNode(
@@ -223,6 +228,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                         key: column.key,
                         model: __props.model,
                         column,
+                        loading: __props.loading,
+                        disabled: __props.disabled,
                         onSearch: onSearchHandler
                       }, createSlots({
                         _: 2
@@ -236,7 +243,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                             ])
                           };
                         })
-                      ]), 1032, ["model", "column"]);
+                      ]), 1032, ["model", "column", "loading", "disabled"]);
                     }),
                     128
                     /* KEYED_FRAGMENT */
@@ -248,7 +255,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             ]),
             _: 3
             /* FORWARDED */
-          }, 16, ["model", "size", "style"])
+          }, 16, ["model", "size", "disabled", "style"])
         ],
         2
         /* CLASS */

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

@@ -1,4 +1,4 @@
-import { ref, computed, watchEffect, unref, nextTick } from 'vue';
+import { ref, computed, watch, watchEffect, unref, nextTick } from 'vue';
 import { ElLoading } from 'element-plus';
 import { isString, isBoolean, isFunction, isPermission, isNumber, isArray } from '../../../utils/is.mjs';
 import { useLocale } from '../../../hooks/useLocale.mjs';
@@ -152,7 +152,6 @@ const useAppTableWrapper = (hy) => {
   const { permissionMap } = usePermissionMap();
   const { t } = useLocale();
   const CACHE_COLUMNS_KEY = props.controller || props.url || "CACHE_COLUMNS_KEY";
-  const loading = ref(true);
   const tableDataSource = ref([]);
   const tableColumns = ref([]);
   const tableColumnsEditablele = ref({});
@@ -209,13 +208,24 @@ const useAppTableWrapper = (hy) => {
     });
     loadingTimer = setTimeout(() => {
       closeAppTableLoading();
-    }, 60 * 1e3);
+    }, props.loadingTimeout);
   }
   function closeAppTableLoading() {
     loadingTimer && clearTimeout(loadingTimer);
     loadingInstance?.close();
     loadingInstance = null;
   }
+  watch(
+    () => hy.loading.value,
+    (value) => {
+      if (value) {
+        showAppTableLoading();
+      } else {
+        closeAppTableLoading();
+      }
+    },
+    { immediate: true }
+  );
   const tableTriggerPosition = ref({
     top: 0,
     left: 0,
@@ -361,15 +371,12 @@ const useAppTableWrapper = (hy) => {
   });
   return {
     // 表格配置项
-    loading,
     tableDataSource,
     tableColumns,
     tableColumnsEditablele,
     tableColumnsList,
     searchPlaceholder,
     doLayout,
-    showAppTableLoading,
-    closeAppTableLoading,
     // 表格行操作配置
     getRowKey,
     selectedList,

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

@@ -3,15 +3,7 @@ import { useApi } from '../../../hooks/useApi.mjs';
 import { isEmpty, isNumber, isString } from '../../../utils/is.mjs';
 
 function useAppTableSearch(hy) {
-  const {
-    props,
-    emits,
-    appSearchRef,
-    tableDataSource,
-    showAppTableLoading,
-    closeAppTableLoading,
-    clearSelection
-  } = hy;
+  const { props, emits, appSearchRef, tableDataSource, clearSelection } = hy;
   const { api } = useApi();
   const totalElements = ref(0);
   const showFilter = ref(true);
@@ -20,7 +12,7 @@ function useAppTableSearch(hy) {
   }
   async function getData(page = null) {
     await nextTick();
-    showAppTableLoading();
+    hy.loading.value = true;
     return new Promise((resolve, reject) => {
       if (!isEmpty(page)) {
         if (isNumber(page) || isString(page)) {
@@ -31,17 +23,17 @@ function useAppTableSearch(hy) {
       const options = { baseURL: props.baseURL, isJSON: props.isJsonData };
       if (props.controller) {
         unref(api).post(`${props.controller}/page`, params, options).then(successFun).finally(() => {
+          hy.loading.value = false;
           resolve();
-          closeAppTableLoading();
         });
       } else if (props.url) {
         unref(api).post(props.url, params, options).then(successFun).finally(() => {
+          hy.loading.value = false;
           resolve();
-          closeAppTableLoading();
         });
       } else {
+        hy.loading.value = false;
         emits("search-data");
-        closeAppTableLoading();
         reject();
       }
     });
@@ -88,7 +80,7 @@ function useAppTableSearch(hy) {
   }
   function setData(dataSource) {
     tableDataSource.value = dataSource || [];
-    closeAppTableLoading();
+    hy.loading.value = false;
   }
   function onSizeChangeHandler(val) {
     props.filterModel.page = 1;

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

@@ -1,4 +1,4 @@
-import { defineComponent, useTemplateRef, openBlock, createElementBlock, createCommentVNode, createElementVNode, createBlock, unref, createVNode, withCtx, toDisplayString, renderSlot, normalizeClass, createSlots, renderList, normalizeProps, guardReactiveProps, mergeProps, Fragment, withModifiers } from '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';
@@ -22,7 +22,7 @@ const __default__ = defineComponent({
   name: "HyTable"
 });
 const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
-  props: {
+  props: /* @__PURE__ */ mergeModels({
     // 表格配置项
     type: {
       type: String,
@@ -82,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
@@ -185,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");
@@ -244,6 +253,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       {
         props,
         emits,
+        loading,
         containerRef,
         tableRef,
         tableDropdownRef,

package/es/version.mjs

@@ -1,3 +1,3 @@
-const version = "0.2.44";
+const version = "0.2.46";
 
 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: true
                   }, __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: true
                   }, __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: true
                   }, __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: true
                   }, __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

@@ -43,6 +43,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: Boolean,
       default: false
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     size: {
       type: String,
       default: "default"
@@ -173,6 +177,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                             rules: __props.rules,
                             columnNum: __props.columnNum,
                             loading: __props.loading,
+                            disabled: __props.disabled,
                             readonly: __props.readonly,
                             style: vue.normalizeStyle(vue.unref(index.columnItemStyle)(props, column))
                           }, vue.createSlots({
@@ -187,7 +192,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 */
@@ -203,6 +208,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                             rules: __props.rules,
                             columnNum: __props.columnNum,
                             loading: __props.loading,
+                            disabled: __props.disabled,
                             readonly: __props.readonly,
                             size: __props.size,
                             style: vue.normalizeStyle(vue.unref(index.columnItemStyle)(props, column))
@@ -218,7 +224,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 */
@@ -232,6 +238,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                             column,
                             rules: __props.rules,
                             loading: __props.loading,
+                            disabled: __props.disabled,
                             readonly: __props.readonly
                           }, vue.createSlots({
                             _: 2
@@ -245,7 +252,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/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,

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

@@ -5,15 +5,7 @@ var useApi = require('../../../hooks/useApi.js');
 var is = require('../../../utils/is.js');
 
 function useAppTableSearch(hy) {
-  const {
-    props,
-    emits,
-    appSearchRef,
-    tableDataSource,
-    showAppTableLoading,
-    closeAppTableLoading,
-    clearSelection
-  } = hy;
+  const { props, emits, appSearchRef, tableDataSource, clearSelection } = hy;
   const { api } = useApi.useApi();
   const totalElements = vue.ref(0);
   const showFilter = vue.ref(true);
@@ -22,7 +14,7 @@ function useAppTableSearch(hy) {
   }
   async function getData(page = null) {
     await vue.nextTick();
-    showAppTableLoading();
+    hy.loading.value = true;
     return new Promise((resolve, reject) => {
       if (!is.isEmpty(page)) {
         if (is.isNumber(page) || is.isString(page)) {
@@ -33,17 +25,17 @@ function useAppTableSearch(hy) {
       const options = { baseURL: props.baseURL, isJSON: props.isJsonData };
       if (props.controller) {
         vue.unref(api).post(`${props.controller}/page`, params, options).then(successFun).finally(() => {
+          hy.loading.value = false;
           resolve();
-          closeAppTableLoading();
         });
       } else if (props.url) {
         vue.unref(api).post(props.url, params, options).then(successFun).finally(() => {
+          hy.loading.value = false;
           resolve();
-          closeAppTableLoading();
         });
       } else {
+        hy.loading.value = false;
         emits("search-data");
-        closeAppTableLoading();
         reject();
       }
     });
@@ -90,7 +82,7 @@ function useAppTableSearch(hy) {
   }
   function setData(dataSource) {
     tableDataSource.value = dataSource || [];
-    closeAppTableLoading();
+    hy.loading.value = false;
   }
   function onSizeChangeHandler(val) {
     props.filterModel.page = 1;

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

@@ -26,7 +26,7 @@ const __default__ = vue.defineComponent({
   name: "HyTable"
 });
 const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
-  props: {
+  props: /* @__PURE__ */ vue.mergeModels({
     // 表格配置项
     type: {
       type: String,
@@ -86,6 +86,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: Boolean,
       default: true
     },
+    loadingTimeout: {
+      // 加载超时
+      type: Number,
+      default: 60 * 1e3
+    },
     showEditable: {
       type: Boolean,
       default: true
@@ -189,17 +194,21 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       // 展开回调
       type: Function
     }
-  },
-  emits: [
+  }, {
+    "loading": { type: Boolean, default: false },
+    "loadingModifiers": {}
+  }),
+  emits: /* @__PURE__ */ vue.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 = vue.useModel(__props, "loading");
     const { t } = useLocale.useLocale();
     const containerRef = vue.useTemplateRef("containerRef");
     const tableRef = vue.useTemplateRef("tableRef");
@@ -248,6 +257,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       {
         props,
         emits,
+        loading,
         containerRef,
         tableRef,
         tableDropdownRef,

package/lib/version.js

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

package/package.json

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