hy-dispatch-ui-v3 0.1.6 → 0.2.0

package/lib/components/appTable/js/index.js

@@ -29,7 +29,7 @@ function tableColumnsEditableleHandler(columns, columnsEditablele, searchArr) {
       searchLabelSet.add(column.label);
     }
   }
-  if ((searchArr == null ? void 0 : searchArr.length) > 0) {
+  if (searchArr?.length > 0) {
     searchArr.forEach((item) => {
       searchLabelSet.add(item.label);
     });
@@ -101,9 +101,11 @@ function operatorFilterHandler(column, scope, type = "all") {
   if (type === "all" || operator.length <= 1 && type === "default") {
     return operator;
   }
-  const btnWidth = 28;
+  const btnWidth = 40;
   const gapWidth = 12;
-  const operatorCount = Math.floor((width - 12 * 2) / (btnWidth + gapWidth));
+  const operatorCount = Math.floor(
+    (width - 12 * 2 - btnWidth) / (btnWidth + gapWidth) + 1
+  );
   if (operatorCount === operator.length) {
     return type === "default" ? operator : [];
   }
@@ -116,7 +118,22 @@ function operatorFilterHandler(column, scope, type = "all") {
 function operatorClickHandler(command, column, scope, type = "all") {
   const operator = operatorFilterHandler(column, scope, type);
   const target = operator[command];
-  (target == null ? void 0 : target.handler) && target.handler(scope);
+  target?.handler && target.handler(scope);
+}
+function renderHeaderHandler(column, scope) {
+  if (!column) return;
+  if (is.isFunction(column.renderHeader)) {
+    return column.renderHeader({ ...scope, column });
+  }
+  return column.label;
+}
+function renderContentHandler(column, scope) {
+  const { row } = scope || {};
+  if (!column || !row) return;
+  if (is.isFunction(column.renderContent)) {
+    return column.renderContent({ ...scope, column });
+  }
+  return row[column.prop];
 }
 const useAppTableWrapper = (hy) => {
   const {
@@ -147,8 +164,7 @@ const useAppTableWrapper = (hy) => {
     sessionStorage.setItem(CACHE_COLUMNS_KEY, JSON.stringify(value));
   }
   function doLayout() {
-    var _a;
-    (_a = tableRef.value) == null ? void 0 : _a.doLayout();
+    tableRef.value?.doLayout && tableRef.value?.doLayout();
   }
   let loadingInstance, loadingTimer;
   function showAppTableLoading() {
@@ -169,7 +185,7 @@ const useAppTableWrapper = (hy) => {
   }
   function closeAppTableLoading() {
     loadingTimer && clearTimeout(loadingTimer);
-    loadingInstance == null ? void 0 : loadingInstance.close();
+    loadingInstance?.close();
     loadingInstance = null;
   }
   const tableTriggerPosition = vue.ref({
@@ -184,7 +200,6 @@ const useAppTableWrapper = (hy) => {
     getBoundingClientRect: () => tableTriggerPosition.value
   });
   function onTableRowContextmenuHandler(row, _, event) {
-    var _a, _b;
     if (props.onRowContextmenu) {
       props.onRowContextmenu(row, _, event);
       return;
@@ -195,18 +210,18 @@ const useAppTableWrapper = (hy) => {
       y: clientY
     });
     const column = tableColumns.value.find(
-      (column2) => column2.prop === "operator"
+      (column2) => column2.type === "operator"
     );
     const operator = operatorFilterHandler(column, { row });
-    if (!(operator == null ? void 0 : operator.length)) return;
+    if (!operator?.length) return;
     tableTriggerRef.value.column = column;
     tableTriggerRef.value.scope = { row };
     event.preventDefault();
-    (_a = tableDropdownRef.value) == null ? void 0 : _a.handleOpen();
+    tableDropdownRef.value?.handleOpen();
     if (is.isArray(operatorDropdownRef.value)) {
       operatorDropdownRef.value.forEach((item) => item.handleClose());
     } else {
-      (_b = operatorDropdownRef.value) == null ? void 0 : _b.handleClose();
+      operatorDropdownRef.value?.handleClose();
     }
   }
   const selectedList = vue.ref([]);
@@ -216,11 +231,12 @@ const useAppTableWrapper = (hy) => {
       return map;
     }, /* @__PURE__ */ new Map());
   });
+  const selectionColumn = vue.computed(() => {
+    return tableColumns.value.find((item) => item.type === "selection");
+  });
   function isSelectable(row) {
-    const column = tableColumns.value.find((column2) => {
-      return column2.type === "selection";
-    });
-    if (!is.isFunction(column == null ? void 0 : column.selectable)) return true;
+    const column = selectionColumn.value;
+    if (!is.isFunction(column?.selectable)) return true;
     return column.selectable(row);
   }
   function getSelectedIndex(row) {
@@ -228,8 +244,7 @@ const useAppTableWrapper = (hy) => {
     return is.isNumber(index) ? index : -1;
   }
   function clearSelection() {
-    var _a;
-    (_a = tableRef.value) == null ? void 0 : _a.clearSelection();
+    tableRef.value?.clearSelection();
   }
   function getSelectedList() {
     return selectedList.value;
@@ -284,6 +299,13 @@ const useAppTableWrapper = (hy) => {
     }
     return className.filter(Boolean).join(" ");
   }
+  const isSearchFocus = vue.ref(false);
+  function onSearchInputHandler() {
+    isSearchFocus.value = true;
+  }
+  function onSearchBlurHandler() {
+    isSearchFocus.value = false;
+  }
   vue.watchEffect(() => {
     const { columnsList, columnsEditablele, searchText } = tableColumnHandler(
       props.tableColumns,
@@ -315,7 +337,11 @@ const useAppTableWrapper = (hy) => {
     onTableSelectHandler,
     onTableRowContextmenuHandler,
     onTableRowClickHandler,
-    onTableColumnsSelectHandler
+    onTableColumnsSelectHandler,
+    // 搜索选中
+    isSearchFocus,
+    onSearchInputHandler,
+    onSearchBlurHandler
   };
 };
 
@@ -323,6 +349,8 @@ exports.operatorClickHandler = operatorClickHandler;
 exports.operatorDisableTextdHandler = operatorDisableTextdHandler;
 exports.operatorDisabledHandler = operatorDisabledHandler;
 exports.operatorFilterHandler = operatorFilterHandler;
+exports.renderContentHandler = renderContentHandler;
+exports.renderHeaderHandler = renderHeaderHandler;
 exports.tableColumnHandler = tableColumnHandler;
 exports.tableColumnShowHandler = tableColumnShowHandler;
 exports.useAppTableWrapper = useAppTableWrapper;

package/lib/components/appTable/js/search.js

@@ -47,8 +47,7 @@ function useAppTableSearch(hy) {
       }
     });
     function successFun(res) {
-      var _a;
-      if (!((_a = res.data.content) == null ? void 0 : _a.length) && props.filterModel.page !== 1) {
+      if (!res.data.content?.length && props.filterModel.page !== 1) {
         getData(1);
         return;
       }

package/lib/components/appTable/js/useAppTable.js

@@ -6,6 +6,7 @@ var is = require('../../../utils/is.js');
 var useLocale = require('../../../hooks/useLocale.js');
 
 function getColumnDefaultConfig(column) {
+  const { t } = useLocale.useLocale();
   switch (column.type) {
     case "selection":
       return {
@@ -13,27 +14,40 @@ function getColumnDefaultConfig(column) {
         reserveSelection: true
       };
     case "index":
+      return {
+        props: `${column.type}_prop`,
+        label: t("table.index")
+      };
     case "expand":
       return {
         prop: `${column.type}_prop`
       };
+    case "operator":
+      return {
+        label: t("table.operator"),
+        prop: `operator_prop`
+      };
     default:
       return {};
   }
 }
 function getColumnDefaultWidth(column) {
   if (column.width) return column.width;
+  if (column.type === "expand" && column.expandType === "expand") return 40;
+  if (column.type === "selection") return 40;
   if (column.type === "index") return 80;
-  if (column.prop === "operator") return 132;
+  if (column.type === "operator") return 172;
   return;
 }
-function getColumnDefaultLabel(column) {
-  const { t } = useLocale.useLocale();
-  if (column.label) return column.label;
-  if (column.type === "index") return t("table.index");
-  return;
+function generateColumnItem(column) {
+  return {
+    ...column,
+    key: column.prop,
+    dataKey: column.prop,
+    title: column.label
+  };
 }
-function getColumnsEditable(column, index) {
+function getColumnEditable(column, index) {
   const { editable, type, prop } = column;
   if (is.isBoolean(editable)) {
     return {
@@ -49,29 +63,55 @@ function getColumnsEditable(column, index) {
     index,
     lock: false,
     edit: !type || type === "default",
-    checked: !type || type !== "default" || prop === "operator",
+    checked: !type || type !== "default" || type === "operator",
     desc: void 0,
     examples: [],
     ...editable || {}
   };
 }
+function getColumnSort(column) {
+  const sort = {
+    prop: column.prop,
+    show: false,
+    default: ""
+  };
+  if (is.isBoolean(column.sort)) {
+    sort.prop = column.prop;
+    sort.show = true;
+  } else if (is.isString(column.sort)) {
+    sort.prop = column.sort;
+    sort.show = true;
+  } else if (is.isObject(column.sort)) {
+    const { prop, show } = column.sort;
+    sort.prop = is.isString(prop) ? prop : sort.prop;
+    sort.show = true;
+    sort.default = ["desc", "asc"].includes(column.sort.default) ? column.sort.default : sort.default;
+  }
+  return sort;
+}
 const useAppTable = (config = {}) => {
   const { columns, filterModel, filterColumns } = config || {};
   const tableColumns = [];
+  let defaultSortInfo = null;
   try {
-    for (let i = 0; i < (columns == null ? void 0 : columns.length); i++) {
+    for (let i = 0; i < columns?.length; i++) {
       const column = columns[i];
       if (is.isEmpty(column.prop) && column.type === "default") {
         throw Error("\u3010column.prop\u3011\u4E0D\u80FD\u4E3A\u7A7A");
       }
-      tableColumns.push({
+      const sort = getColumnSort(column);
+      if (!defaultSortInfo && sort.default) {
+        defaultSortInfo = sort;
+      }
+      const target = {
         ...getColumnDefaultConfig(column),
         ...column,
         type: column.type || "default",
         width: getColumnDefaultWidth(column),
-        label: getColumnDefaultLabel(column),
-        editable: getColumnsEditable(column, i)
-      });
+        sort,
+        editable: getColumnEditable(column, i)
+      };
+      tableColumns.push(generateColumnItem(target));
     }
   } catch (err) {
     console.error(err);
@@ -82,6 +122,10 @@ const useAppTable = (config = {}) => {
     // 当前分页数
     size: 15,
     // 每页数量
+    sortBy: defaultSortInfo?.prop,
+    // 排序字段
+    orderSort: defaultSortInfo?.default,
+    // 排序方式
     ...filterModel
   });
   return {

package/lib/components/appTable/style/appTable.scss

@@ -21,4 +21,20 @@
       }
     }
   }
+  .app-table-search {
+    width: 160px;
+    .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/appTooltip/appTooltip.vue.js

@@ -18,13 +18,15 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       default: false
     },
     disabled: {
-      type: Boolean
+      type: Boolean,
+      default: false
     },
     class: {
       type: String
     },
     overLine: {
-      type: [String, Number]
+      type: Number,
+      default: 1
     },
     content: {
       type: String
@@ -32,7 +34,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
   },
   setup(__props) {
     const props = __props;
-    const isDisabled = vue.ref(props.disabled);
+    const isShow = vue.ref(false);
+    const isDisabled = vue.computed(() => {
+      if (props.disabled || props.isAlways) {
+        return props.disabled;
+      }
+      return isShow.value;
+    });
     const appClass = vue.computed(() => {
       const classList = [props.class, "break-all"];
       const overLine = props.overLine;
@@ -42,11 +50,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       return classList.filter(Boolean);
     });
     function onMouseenterHandler(e) {
-      if (props.disabled || props.isAlways) {
-        isDisabled.value = props.disabled;
-        return;
-      }
-      isDisabled.value = !is.isOverflowing(e.target);
+      isShow.value = !is.isOverflowing(e.target);
     }
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElTooltip), vue.mergeProps({
@@ -57,12 +61,19 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         "popper-class": "max-w-[300px]"
       }, _ctx.$attrs, {
         disabled: isDisabled.value,
-        content: __props.content
+        content: _ctx.$slots.content ? void 0 : __props.content
       }), vue.createSlots({
         default: vue.withCtx(() => [
-          vue.createElementVNode(
+          __props.isAlways ? vue.renderSlot(_ctx.$slots, "default", { key: 0 }, () => [
+            vue.createTextVNode(
+              vue.toDisplayString(__props.content),
+              1
+              /* TEXT */
+            )
+          ]) : (vue.openBlock(), vue.createElementBlock(
             "span",
             {
+              key: 1,
               class: vue.normalizeClass(appClass.value),
               onMouseenter: onMouseenterHandler
             },
@@ -77,12 +88,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             ],
             34
             /* CLASS, NEED_HYDRATION */
-          )
+          ))
         ]),
         _: 2
         /* DYNAMIC */
       }, [
-        !_ctx.$slots.content ? {
+        _ctx.$slots.content ? {
           name: "content",
           fn: vue.withCtx(() => [
             vue.renderSlot(_ctx.$slots, "content")