hy-dispatch-ui-v3 0.2.44 → 0.2.46

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: false
                   }, __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: false
                   }, __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: false
                   }, __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: false
                   }, __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

@@ -35,7 +35,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: Boolean,
       default: false
     },
-    loading: {
+    disabled: {
       type: Boolean,
       default: false
     },
@@ -168,7 +168,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: normalizeStyle(unref(columnItemStyle)(props, column))
                           }, createSlots({
@@ -183,7 +184,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 */
@@ -198,7 +199,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: normalizeStyle(unref(columnItemStyle)(props, column))
@@ -214,7 +216,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 */
@@ -227,7 +229,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
                           }, createSlots({
                             _: 2
@@ -241,7 +244,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/hyInput/index.mjs

@@ -1,7 +1,9 @@
 import _sfc_main from './input.vue.mjs';
+import _sfc_main$1 from './inputSearch.vue.mjs';
 import { withInstall } from '../../utils/handler.mjs';
 
 const HyInput = withInstall(_sfc_main);
+const HyInputSearch = withInstall(_sfc_main$1);
 const ElInput = withInstall(_sfc_main, "ElInput");
 
-export { ElInput, HyInput, HyInput as default };
+export { ElInput, HyInput, HyInputSearch, HyInput as default };

package/es/components/hyInput/inputSearch.vue.mjs

@@ -0,0 +1,122 @@
+import { useModel, useTemplateRef, ref, computed, openBlock, createElementBlock, normalizeClass, renderSlot, createVNode, mergeProps, withKeys, createSlots, renderList, withCtx, normalizeProps, guardReactiveProps, createElementVNode, unref, mergeModels, defineComponent } from 'vue';
+import { ElIcon } from 'element-plus';
+import { Search } from '@element-plus/icons-vue';
+import _sfc_main$1 from './input.vue.mjs';
+
+import "./style/inputSearch.scss";
+
+const __default__ = defineComponent({
+  name: "HyInputSearch"
+});
+const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
+  props: /* @__PURE__ */ mergeModels({}, {
+    "modelValue": {
+      type: [String, Number],
+      default: ""
+    },
+    "modelModifiers": {}
+  }),
+  emits: /* @__PURE__ */ mergeModels(["search"], ["update:modelValue"]),
+  setup(__props, { expose: __expose, emit: __emit }) {
+    const emits = __emit;
+    const modelValue = useModel(__props, "modelValue");
+    const inputRef = useTemplateRef("inputRef");
+    const isSearchFocus = 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: computed(() => {
+        return inputRef.value.input;
+      }),
+      ref: computed(() => {
+        return inputRef.value.ref;
+      }),
+      resizeTextarea() {
+        inputRef.value.resizeTextarea();
+      },
+      select() {
+        inputRef.value.select();
+      },
+      textarea: computed(() => {
+        return inputRef.value.textarea;
+      }),
+      textareaStyle: computed(() => {
+        return inputRef.value.textareaStyle;
+      }),
+      isComposing: computed(() => {
+        return inputRef.value.isComposing;
+      }),
+      passwordVisible: computed(() => {
+        return inputRef.value.passwordVisible;
+      })
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock(
+        "div",
+        {
+          class: normalizeClass(["hy-input-search", { focus: isSearchFocus.value }])
+        },
+        [
+          renderSlot(_ctx.$slots, "before"),
+          createVNode(_sfc_main$1, 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: withKeys(onSearchQueryHandler, ["enter"])
+          }), createSlots({
+            _: 2
+            /* DYNAMIC */
+          }, [
+            renderList(_ctx.$slots, (_, slotName) => {
+              return {
+                name: slotName,
+                fn: withCtx((scope) => [
+                  renderSlot(_ctx.$slots, slotName, normalizeProps(guardReactiveProps(scope)))
+                ])
+              };
+            })
+          ]), 1040, ["modelValue", "onUpdate:modelValue"]),
+          createElementVNode("div", {
+            class: "w-[32px] h-[32px] flex-shrink-0 flex items-center justify-center bg-background-3 rounded-[2px] cursor-pointer",
+            onClick: onSearchQueryHandler
+          }, [
+            createVNode(unref(ElIcon), { size: "18" }, {
+              default: withCtx(() => [
+                createVNode(unref(Search))
+              ]),
+              _: 1
+              /* STABLE */
+            })
+          ])
+        ],
+        2
+        /* CLASS */
+      );
+    };
+  }
+});
+
+export { _sfc_main as default };

package/es/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/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;