hy-dispatch-ui-v3 0.2.44 → 0.2.46

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var vue = require('vue');
 var elementPlus = require('element-plus');
 var iconsVue = require('@element-plus/icons-vue');
-var index$4 = require('./js/index.js');
+var index$5 = require('./js/index.js');
 var search = require('./js/search.js');
 var headerItem = require('./cpns/headerItem.vue.js');
 var columnSelect = require('./cpns/columnSelect.vue.js');
@@ -13,9 +13,10 @@ var virtualTable = require('./cpns/virtualTable.vue.js');
 var useLocale = require('../../hooks/useLocale.js');
 var useMixins = require('../../hooks/useMixins.js');
 var index = require('../hyTooltip/index.js');
-var index$1 = require('../hyButton/index.js');
-var index$2 = require('../hyIcon/index.js');
-var index$3 = require('../hySearch/index.js');
+var index$1 = require('../hyInput/index.js');
+var index$2 = require('../hyButton/index.js');
+var index$3 = require('../hyIcon/index.js');
+var index$4 = require('../hySearch/index.js');
 var adaptive = require('../../utils/adaptive.js');
 var is = require('../../utils/is.js');
 
@@ -25,7 +26,7 @@ const __default__ = vue.defineComponent({
   name: "HyTable"
 });
 const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
-  props: {
+  props: /* @__PURE__ */ vue.mergeModels({
     // 表格配置项
     type: {
       type: String,
@@ -85,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
@@ -188,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");
@@ -247,13 +257,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       {
         props,
         emits,
+        loading,
         containerRef,
         tableRef,
         tableDropdownRef,
         operatorDropdownRef,
         appSearchRef
       },
-      [index$4.useAppTableWrapper, search.useAppTableSearch]
+      [index$5.useAppTableWrapper, search.useAppTableSearch]
     );
     if (props.defaultGetData) {
       getData(1);
@@ -284,7 +295,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             key: 0,
             class: "min-h-[36px] flex flex-row-reverse items-center justify-between gap-3 mb-4"
           }, [
-            vue.createElementVNode("div", { class: "flex gap-3 whitespace-nowrap" }, [
+            vue.createElementVNode("div", { class: "flex items-center gap-3 whitespace-nowrap" }, [
               __props.showEditable ? (vue.openBlock(), vue.createBlock(columnSelect.default, {
                 key: 0,
                 columns: vue.unref(tableColumns),
@@ -324,54 +335,22 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   }, null, 8, ["innerHTML"])
                 ]),
                 default: vue.withCtx(() => [
-                  vue.createElementVNode(
-                    "div",
-                    {
-                      class: vue.normalizeClass(["border border-border hover:border-theme rounded overflow-hidden", { "!border-theme": vue.unref(isSearchFocus) }])
-                    },
-                    [
-                      vue.createVNode(vue.unref(elementPlus.ElInput), {
-                        modelValue: __props.filterModel.query,
-                        "onUpdate:modelValue": ($event) => __props.filterModel.query = $event,
-                        class: "hy-table-search",
-                        placeholder: vue.unref(t)("table.searchFor", [__props.controllerText || ""]),
-                        clearable: "",
-                        onFocus: vue.unref(onSearchInputHandler),
-                        onBlur: vue.unref(onSearchBlurHandler),
-                        onClear: vue.unref(onSearchQueryHandler),
-                        onKeydown: vue.withKeys(vue.unref(onSearchQueryHandler), ["enter"])
-                      }, {
-                        append: vue.withCtx(() => [
-                          vue.createElementVNode("div", {
-                            class: "w-[32px] h-full flex items-center justify-center bg-background-3 rounded-[2px] cursor-pointer",
-                            onClick: vue.unref(onSearchQueryHandler)
-                          }, [
-                            vue.createVNode(vue.unref(elementPlus.ElIcon), { size: "18" }, {
-                              default: vue.withCtx(() => [
-                                vue.createVNode(vue.unref(iconsVue.Search))
-                              ]),
-                              _: 1
-                              /* STABLE */
-                            })
-                          ], 8, ["onClick"])
-                        ]),
-                        _: 1
-                        /* STABLE */
-                      }, 8, ["modelValue", "onUpdate:modelValue", "placeholder", "onFocus", "onBlur", "onClear", "onKeydown"])
-                    ],
-                    2
-                    /* CLASS */
-                  )
+                  vue.createVNode(vue.unref(index$1.HyInputSearch), {
+                    modelValue: __props.filterModel.query,
+                    "onUpdate:modelValue": ($event) => __props.filterModel.query = $event,
+                    placeholder: vue.unref(t)("table.searchFor", [__props.controllerText || ""]),
+                    onSearch: vue.unref(onSearchQueryHandler)
+                  }, null, 8, ["modelValue", "onUpdate:modelValue", "placeholder", "onSearch"])
                 ]),
                 _: 1
                 /* STABLE */
-              })) : (vue.openBlock(), vue.createBlock(vue.unref(index$1.HyButton), {
+              })) : (vue.openBlock(), vue.createBlock(vue.unref(index$2.HyButton), {
                 key: 3,
                 type: "primary",
                 onClick: ($event) => vue.unref(getData)()
               }, {
                 default: vue.withCtx(() => [
-                  vue.createVNode(vue.unref(index$2.HyIcon), {
+                  vue.createVNode(vue.unref(index$3.HyIcon), {
                     class: "w-[12px] h-[12px]",
                     "svg-name": "ops-button-icon-refres-v2"
                   })
@@ -389,7 +368,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             ])) : vue.createCommentVNode("v-if", true)
           ])) : vue.createCommentVNode("v-if", true),
           vue.createCommentVNode(" \u67E5\u8BE2\u8FC7\u6EE4 "),
-          __props.filterColumns.length > 0 ? (vue.openBlock(), vue.createBlock(vue.unref(index$3.HySearch), {
+          __props.filterColumns.length > 0 ? (vue.openBlock(), vue.createBlock(vue.unref(index$4.HySearch), {
             key: 1,
             ref_key: "appSearchRef",
             ref: appSearchRef,
@@ -473,11 +452,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                 }, {
                                   default: vue.withCtx(() => [
                                     vue.renderSlot(_ctx.$slots, column.headerSlot, vue.mergeProps({ ref_for: true }, { column, $index: scope.$index }), () => [
-                                      !vue.unref(is.isEmpty)(vue.unref(index$4.renderHeaderHandler)(column, scope)) ? (vue.openBlock(), vue.createBlock(vue.unref(index.HyTooltip), {
+                                      !vue.unref(is.isEmpty)(vue.unref(index$5.renderHeaderHandler)(column, scope)) ? (vue.openBlock(), vue.createBlock(vue.unref(index.HyTooltip), {
                                         key: 0,
                                         "is-always": false,
                                         "over-line": 1,
-                                        content: vue.unref(index$4.renderHeaderHandler)(column, scope)
+                                        content: vue.unref(index$5.renderHeaderHandler)(column, scope)
                                       }, null, 8, ["content"])) : vue.createCommentVNode("v-if", true)
                                     ])
                                   ]),
@@ -493,7 +472,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                   (vue.openBlock(true), vue.createElementBlock(
                                     vue.Fragment,
                                     null,
-                                    vue.renderList(vue.unref(index$4.operatorFilterHandler)(
+                                    vue.renderList(vue.unref(index$5.operatorFilterHandler)(
                                       column,
                                       scope,
                                       "default"
@@ -507,11 +486,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                         default: vue.withCtx(() => [
                                           vue.createElementVNode("div", {
                                             class: vue.normalizeClass(["w-[40px] h-[48px] inline-flex flex-col items-center justify-center text-xs hover:font-bold border border-transparent hover:border-theme hover:shadow-[0px_0px_5px_0px_rgba(var(--hy-theme),0.5)] rounded box-border cursor-pointer", citem.className]),
-                                            onClick: vue.withModifiers(($event) => vue.unref(index$4.operatorClickHandler)(cindex, column, scope, "default"), ["stop"]),
+                                            onClick: vue.withModifiers(($event) => vue.unref(index$5.operatorClickHandler)(cindex, column, scope, "default"), ["stop"]),
                                             onContextmenu: vue.withModifiers(() => {
                                             }, ["stop"])
                                           }, [
-                                            vue.createVNode(vue.unref(index$2.HyIcon), {
+                                            vue.createVNode(vue.unref(index$3.HyIcon), {
                                               "svg-name": citem.svgName,
                                               "class-name": "!w-4 !h-4"
                                             }, null, 8, ["svg-name"]),
@@ -537,7 +516,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                     128
                                     /* KEYED_FRAGMENT */
                                   )),
-                                  vue.unref(index$4.operatorFilterHandler)(column, scope, "more")?.length ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElDropdown), {
+                                  vue.unref(index$5.operatorFilterHandler)(column, scope, "more")?.length ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElDropdown), {
                                     key: 0,
                                     ref_for: true,
                                     ref_key: "operatorDropdownRef",
@@ -545,7 +524,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                     trigger: "click",
                                     "popper-style": "min-width: 150px",
                                     placement: "bottom",
-                                    onCommand: ($event) => vue.unref(index$4.operatorClickHandler)($event, column, scope, "more")
+                                    onCommand: ($event) => vue.unref(index$5.operatorClickHandler)($event, column, scope, "more")
                                   }, {
                                     dropdown: vue.withCtx(() => [
                                       vue.createVNode(
@@ -556,7 +535,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                             (vue.openBlock(true), vue.createElementBlock(
                                               vue.Fragment,
                                               null,
-                                              vue.renderList(vue.unref(index$4.operatorFilterHandler)(
+                                              vue.renderList(vue.unref(index$5.operatorFilterHandler)(
                                                 column,
                                                 scope,
                                                 "more"
@@ -564,7 +543,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                                 return vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElDropdownItem), {
                                                   key: cindex,
                                                   command: cindex,
-                                                  disabled: vue.unref(index$4.operatorDisabledHandler)(citem, scope)
+                                                  disabled: vue.unref(index$5.operatorDisabledHandler)(citem, scope)
                                                 }, {
                                                   default: vue.withCtx(() => [
                                                     vue.createElementVNode("span", null, [
@@ -575,13 +554,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                                         1
                                                         /* TEXT */
                                                       ),
-                                                      vue.unref(index$4.operatorDisabledHandler)(citem, scope) ? (vue.openBlock(), vue.createElementBlock(
+                                                      vue.unref(index$5.operatorDisabledHandler)(citem, scope) ? (vue.openBlock(), vue.createElementBlock(
                                                         "span",
                                                         {
                                                           key: 0,
                                                           class: "text-xs leading-1"
                                                         },
-                                                        "\uFF08" + vue.toDisplayString(vue.unref(index$4.operatorDisableTextdHandler)(citem, scope)) + "\uFF09",
+                                                        "\uFF08" + vue.toDisplayString(vue.unref(index$5.operatorDisableTextdHandler)(citem, scope)) + "\uFF09",
                                                         1
                                                         /* TEXT */
                                                       )) : vue.createCommentVNode("v-if", true)
@@ -647,11 +626,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                   vue.Fragment,
                                   { key: 2 },
                                   [
-                                    !vue.unref(is.isEmpty)(vue.unref(index$4.renderContentHandler)(column, scope)) ? (vue.openBlock(), vue.createBlock(vue.unref(index.HyTooltip), {
+                                    !vue.unref(is.isEmpty)(vue.unref(index$5.renderContentHandler)(column, scope)) ? (vue.openBlock(), vue.createBlock(vue.unref(index.HyTooltip), {
                                       key: 0,
                                       "over-line": 2,
                                       "is-always": false,
-                                      content: vue.unref(index$4.renderContentHandler)(column, scope)
+                                      content: vue.unref(index$5.renderContentHandler)(column, scope)
                                     }, null, 8, ["content"])) : (vue.openBlock(), vue.createElementBlock("span", {
                                       key: 1,
                                       class: "text-auxiliary"
@@ -778,7 +757,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             "virtual-triggering": "",
             trigger: "contextmenu",
             placement: "bottom",
-            onCommand: ($event) => vue.unref(index$4.operatorClickHandler)(
+            onCommand: ($event) => vue.unref(index$5.operatorClickHandler)(
               $event,
               vue.unref(tableTriggerRef).column,
               vue.unref(tableTriggerRef).scope
@@ -790,14 +769,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   (vue.openBlock(true), vue.createElementBlock(
                     vue.Fragment,
                     null,
-                    vue.renderList(vue.unref(index$4.operatorFilterHandler)(
+                    vue.renderList(vue.unref(index$5.operatorFilterHandler)(
                       vue.unref(tableTriggerRef).column,
                       vue.unref(tableTriggerRef).scope
                     ), (citem, cindex) => {
                       return vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElDropdownItem), {
                         key: cindex,
                         command: cindex,
-                        disabled: vue.unref(index$4.operatorDisabledHandler)(citem, vue.unref(tableTriggerRef).scope)
+                        disabled: vue.unref(index$5.operatorDisabledHandler)(citem, vue.unref(tableTriggerRef).scope)
                       }, {
                         default: vue.withCtx(() => [
                           vue.createElementVNode("span", null, [
@@ -808,13 +787,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                               1
                               /* TEXT */
                             ),
-                            vue.unref(index$4.operatorDisabledHandler)(citem, vue.unref(tableTriggerRef).scope) ? (vue.openBlock(), vue.createElementBlock(
+                            vue.unref(index$5.operatorDisabledHandler)(citem, vue.unref(tableTriggerRef).scope) ? (vue.openBlock(), vue.createElementBlock(
                               "span",
                               {
                                 key: 0,
                                 class: "text-xs leading-1"
                               },
-                              "\uFF08" + vue.toDisplayString(vue.unref(index$4.operatorDisableTextdHandler)(citem, vue.unref(tableTriggerRef).scope)) + "\uFF09",
+                              "\uFF08" + vue.toDisplayString(vue.unref(index$5.operatorDisableTextdHandler)(citem, vue.unref(tableTriggerRef).scope)) + "\uFF09",
                               1
                               /* TEXT */
                             )) : vue.createCommentVNode("v-if", true)

package/lib/components/index.js

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

package/lib/index.js

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

package/lib/version.js

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

package/package.json

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