ele-admin-plus 1.1.3 → 1.1.4-beta.2

package/es/ele-pro-table/util.js

@@ -1,4 +1,33 @@
-import { omit, uuid, eachTree } from "../utils/core";
+import { unref } from "vue";
+import { omit, eachTree, uuid, mapTree } from "../utils/core";
+function mergeProps(props, globalProps) {
+  if (props == null) {
+    return globalProps ?? true;
+  }
+  if (!props) {
+    return false;
+  }
+  if (!globalProps || typeof globalProps !== "object") {
+    return props;
+  }
+  if (typeof props !== "object") {
+    return globalProps;
+  }
+  return { ...globalProps, ...props };
+}
+function getValue(data, field) {
+  if (typeof field === "function") {
+    return field(data);
+  }
+  if (!field) {
+    return;
+  }
+  let value = data;
+  field.split(".").forEach((f) => {
+    value = value ? value[f] : null;
+  });
+  return value;
+}
 function getTablePage(pagination, globalPagination) {
   const props = getPaginationProps(void 0, pagination, globalPagination);
   return (props == null ? void 0 : props.currentPage) ?? 1;
@@ -24,21 +53,6 @@ function getPaginationProps(size, pagination, globalPagination, pageProps) {
   }
   return Object.assign(defaultProps, omit(props, ["autoAmend"]), pageProps);
 }
-function mergeProps(props, globalProps) {
-  if (props == null) {
-    return globalProps ?? true;
-  }
-  if (!props) {
-    return false;
-  }
-  if (!globalProps || typeof globalProps !== "object") {
-    return props;
-  }
-  if (typeof props !== "object") {
-    return globalProps;
-  }
-  return { ...globalProps, ...props };
-}
 function isAutoAmend(pagination, globalPagination) {
   const props = mergeProps(pagination, globalPagination);
   if (!props) {
@@ -49,6 +63,18 @@ function isAutoAmend(pagination, globalPagination) {
   }
   return props === true;
 }
+function getTableSize(cacheKey, size, globalSize) {
+  return getCacheSize(cacheKey) ?? size ?? globalSize ?? "default";
+}
+function getDefaultFilter(columns) {
+  const filter = {};
+  eachTree(columns, (d) => {
+    if (typeof d.columnKey === "string" && d.columnKey.length && d.filteredValue) {
+      filter[d.columnKey] = d.filteredValue;
+    }
+  });
+  return filter;
+}
 function getRequestName(globalRequest, request) {
   const defaultRequest = {
     sortName: "sort",
@@ -65,22 +91,6 @@ function getResponseName(globalResponse, response) {
   };
   return Object.assign(defaultResponse, globalResponse, response);
 }
-function getTableSize(cacheKey, size, globalSize) {
-  return getCacheSize(cacheKey) ?? size ?? globalSize ?? "default";
-}
-function getValue(data, field) {
-  if (typeof field === "function") {
-    return field(data);
-  }
-  if (!field) {
-    return;
-  }
-  let value = data;
-  field.split(".").forEach((f) => {
-    value = value ? value[f] : null;
-  });
-  return value;
-}
 function getOrderItems(sorter) {
   var _a, _b;
   const orders = [];
@@ -104,6 +114,71 @@ function getOrderItems(sorter) {
   }
   return orders;
 }
+function getRequestOrders(sorter, request, globalRequest) {
+  const orders = {};
+  const { sortName, orderName, ascValue, descValue } = getRequestName(
+    globalRequest,
+    request
+  );
+  if (!sortName || !orderName) {
+    return orders;
+  }
+  const items = getOrderItems(sorter);
+  if (items.length === 1) {
+    orders[sortName] = items[0].field;
+    orders[orderName] = items[0].descend ? descValue : ascValue;
+  } else if (items.length) {
+    orders[sortName] = items.map((d) => [d.field, d.descend ? descValue : ascValue].join(" ")).join(",");
+  }
+  return orders;
+}
+function getRequestFilters(filter) {
+  const filters = {};
+  if (filter) {
+    Object.keys(filter).forEach((key) => {
+      const value = filter[key];
+      if (value == null) {
+        return;
+      }
+      if (typeof value === "string") {
+        if (value) {
+          filters[key] = value;
+        }
+      } else if (Array.isArray(value)) {
+        if (value.length) {
+          filters[key] = value.join(",");
+        }
+      } else {
+        filters[key] = value;
+      }
+    });
+  }
+  return filters;
+}
+function getResponseResult(data, response, globalResponse, lazy, treeOpt) {
+  if (!data || Array.isArray(data)) {
+    return { data: getResponseData(data, lazy, treeOpt) };
+  }
+  const { dataName, countName } = getResponseName(globalResponse, response);
+  if (!dataName) {
+    return {};
+  }
+  return {
+    data: getResponseData(getValue(data, dataName), lazy, treeOpt),
+    total: (countName ? getValue(data, countName) : void 0) ?? 0
+  };
+}
+function getResponseData(data, lazy, treeProps) {
+  if (!data || !lazy) {
+    return data;
+  }
+  const name = (treeProps == null ? void 0 : treeProps.hasChildren) ?? "hasChildren";
+  return data.map((d) => {
+    const temp = { ...d };
+    temp[name] = temp[name] ?? true;
+    return temp;
+  });
+}
 function reloadData(datasource, sorter, page, limit) {
   const data = sortData(datasource, sorter);
   const total = data.length;
@@ -138,30 +213,6 @@ function sortData(datasource, sorter) {
   });
   return data;
 }
-function getRequestFilters(filter) {
-  const filters = {};
-  Object.keys(filter).forEach((key) => {
-    const value = filter[key];
-    if (value == null) {
-      return;
-    }
-    if (typeof value === "string") {
-      if (value) {
-        filters[key] = value;
-      }
-    } else if (Array.isArray(value)) {
-      if (value.length) {
-        filters[key] = value.join(",");
-      }
-    } else {
-      filters[key] = value;
-    }
-  });
-  return filters;
-}
-function selectionIsChange(rows, selections) {
-  return rows !== selections && (selections == null || rows.length !== selections.length || rows.some((t) => !(selections && selections.includes(t))));
-}
 function getColId(column) {
   return column ? column.columnKey || column.prop : void 0;
 }
@@ -199,12 +250,12 @@ function getCheckedColumns(columns, cols, checkedIds, sortable) {
     if (colId == null) {
       return;
     }
-    const temp = cols.find((c) => c.id === colId);
+    const temp = cols.find((c) => c.uid === colId);
     if (temp && !checkedIds.includes(colId)) {
       return;
     }
     const fixed = (temp == null ? void 0 : temp.fixed) ?? d.fixed;
-    const id = uuid(8);
+    const uid = uuid(8);
     if (d.children) {
       const children = getCheckedColumns(
         d.children,
@@ -213,10 +264,10 @@ function getCheckedColumns(columns, cols, checkedIds, sortable) {
         sortable
       );
       if (children.length) {
-        data.push({ ...d, fixed, id, children });
+        data.push({ ...d, fixed, uid, children });
       }
     } else {
-      data.push({ ...d, fixed, id });
+      data.push({ ...d, fixed, uid });
     }
   });
   if (!sortable || !data.length) {
@@ -226,15 +277,15 @@ function getCheckedColumns(columns, cols, checkedIds, sortable) {
     var _a, _b;
     const aColId = getColId(a);
     const bColId = getColId(b);
-    let ai = cols.findIndex((c) => c.id === aColId);
-    let bi = cols.findIndex((c) => c.id === bColId);
+    let ai = cols.findIndex((c) => c.uid === aColId);
+    let bi = cols.findIndex((c) => c.uid === bColId);
     if (ai === -1 && ((_a = a.children) == null ? void 0 : _a.length)) {
       const colId = getColId(a.children[0]);
-      ai = cols.findIndex((c) => c.id === colId);
+      ai = cols.findIndex((c) => c.uid === colId);
     }
     if (bi === -1 && ((_b = b.children) == null ? void 0 : _b.length)) {
       const colId = getColId(b.children[0]);
-      bi = cols.findIndex((c) => c.id === colId);
+      bi = cols.findIndex((c) => c.uid === colId);
     }
     if (ai === -1 && a.hideInSetting && a.fixed === "right") {
       ai = cols.length;
@@ -268,7 +319,7 @@ function getSettingCols(columns, untitledText, cacheKey) {
     const colId = getColId(d);
     if (colId && !((_a = d.children) == null ? void 0 : _a.length) && !d.hideInSetting && !(d.type && hideTypes.includes(d.type))) {
       data.push({
-        id: colId,
+        uid: colId,
         prop: d.prop,
         columnKey: d.columnKey,
         label: d.label || untitledText,
@@ -277,14 +328,35 @@ function getSettingCols(columns, untitledText, cacheKey) {
       });
     }
   });
-  const checkedIds = data.filter((d) => d.checked).map((d) => d.id);
+  return getColsResult(data);
+}
+function getColsResult(cols) {
+  const ids = cols.filter((d) => d.checked).map((d) => d.uid);
   return {
-    data,
-    checkedIds,
-    isChecked: data.length > 0 && data.length === checkedIds.length,
-    isIndeterminate: checkedIds.length !== 0 && data.length !== checkedIds.length
+    data: sortCols(cols),
+    checkedIds: ids,
+    isChecked: cols.length > 0 && cols.length === ids.length,
+    isIndeterminate: ids.length !== 0 && cols.length !== ids.length
   };
 }
+function sortCols(cols) {
+  cols.sort((a, b) => {
+    let ai = cols.indexOf(a);
+    let bi = cols.indexOf(b);
+    if (a.fixed === true || a.fixed === "left") {
+      ai -= cols.length;
+    } else if (a.fixed === "right") {
+      ai += cols.length;
+    }
+    if (b.fixed === true || b.fixed === "left") {
+      bi -= cols.length;
+    } else if (b.fixed === "right") {
+      bi += cols.length;
+    }
+    return ai - bi;
+  });
+  return cols;
+}
 function getCacheCols(cacheKey) {
   if (!cacheKey) {
     return;
@@ -298,14 +370,14 @@ function getCacheCols(cacheKey) {
     if (!Array.isArray(data)) {
       return;
     }
-    const checkedIds = data.filter((d) => d.checked).map((d) => d.id);
-    return {
-      data,
-      checkedIds,
-      isChecked: data.length > 0 && data.length === checkedIds.length,
-      isIndeterminate: checkedIds.length !== 0 && data.length !== checkedIds.length
-    };
-  } catch (_e) {
+    data.forEach((d) => {
+      if (d.uid == null && d.id != null) {
+        d.uid = d.id;
+      }
+    });
+    return getColsResult(data);
+  } catch (e) {
+    console.error(e);
   }
 }
 function getColsCacheKey(cacheKey) {
@@ -322,6 +394,9 @@ function getCacheSize(cacheKey) {
     }
   }
 }
+function selectionIsChange(rows, selections) {
+  return rows !== selections && (selections == null || rows.length !== selections.length || rows.some((t) => !(selections && selections.includes(t))));
+}
 function isDisableRow(row, index, columns) {
   let disabled = false;
   eachTree(columns, (col) => {
@@ -332,6 +407,38 @@ function isDisableRow(row, index, columns) {
   });
   return disabled;
 }
+function getTableFilter(tableRef) {
+  var _a, _b;
+  const states = (_b = (_a = unref(tableRef)) == null ? void 0 : _a.store) == null ? void 0 : _b.states;
+  const columns = unref(states == null ? void 0 : states.columns);
+  const filters = unref(states == null ? void 0 : states.filters);
+  if (!filters || !columns) {
+    return;
+  }
+  const keys = Object.keys(filters);
+  const filter = {};
+  columns.forEach((col) => {
+    if (keys.includes(col.id)) {
+      filter[col.columnKey || col.id] = filters[col.id];
+    }
+  });
+  return filter;
+}
+function getTableState(cols, data) {
+  const { sorter, filter } = data;
+  const filterKeys = filter == null ? [] : Object.keys(filter);
+  const hasSorter = sorter != null && sorter.prop != null && sorter.prop != "";
+  let hasSortCol = false;
+  const result = mapTree(cols, (col) => {
+    if (hasSorter && col.prop === sorter.prop) {
+      hasSortCol = true;
+    }
+    const t = col.columnKey && filterKeys.includes(col.columnKey);
+    const filteredValue = t ? filter[col.columnKey] : [];
+    return { ...col, filteredValue };
+  });
+  return { cols: result, sorter: hasSorter && hasSortCol ? sorter : void 0 };
+}
 function useTableMethods(getIns) {
   return {
     clearSelection: () => {
@@ -454,24 +561,32 @@ export {
   getCheckedColumns,
   getColId,
   getColsCacheKey,
+  getColsResult,
+  getDefaultFilter,
   getInitCacheColumns,
   getInitColumns,
   getOrderItems,
   getPaginationProps,
   getRequestFilters,
   getRequestName,
+  getRequestOrders,
+  getResponseData,
   getResponseName,
+  getResponseResult,
   getSettingCols,
   getSizeCacheKey,
+  getTableFilter,
   getTableLimit,
   getTablePage,
   getTableSize,
+  getTableState,
   getValue,
   isAutoAmend,
   isDisableRow,
   mergeProps,
   reloadData,
   selectionIsChange,
+  sortCols,
   sortData,
   useTableEvents,
   useTableMethods

package/es/ele-qr-code/index.d.ts

@@ -22,7 +22,7 @@ declare const _default: import("vue").DefineComponent<{
         default: number;
     };
     imageSettings: import("vue").PropType<import("./types").ImageSettings>;
-    customStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    customStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
 }, {
     canvasRef: import("vue").Ref<HTMLCanvasElement | null>;
     imageRef: import("vue").Ref<HTMLImageElement | null>;
@@ -54,14 +54,14 @@ declare const _default: import("vue").DefineComponent<{
         default: number;
     };
     imageSettings: import("vue").PropType<import("./types").ImageSettings>;
-    customStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    customStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
 }>> & {
     onDone?: (() => any) | undefined;
 }, {
     size: number;
+    margin: number;
     level: import("./types").Level;
     bgColor: string;
     fgColor: string;
-    margin: number;
 }, {}>;
 export default _default;

package/es/ele-qr-code/props.d.ts

@@ -1,5 +1,4 @@
 import type { PropType, ExtractPropTypes } from 'vue';
-import type { StyleValue } from '../ele-app/types';
 import type { Level, ImageSettings } from './types';
 /**
  * 属性
@@ -27,7 +26,7 @@ export declare const qrCodeProps: {
         default: number;
     };
     imageSettings: PropType<ImageSettings>;
-    customStyle: PropType<StyleValue>;
+    customStyle: PropType<Partial<import("vue").CSSProperties>>;
 };
 export type QrCodeProps = ExtractPropTypes<typeof qrCodeProps>;
 /**

package/es/ele-qr-code-svg/index.d.ts

@@ -21,7 +21,7 @@ declare const _default: import("vue").DefineComponent<{
         default: number;
     };
     imageSettings: import("vue").PropType<import("../ele-qr-code/types").ImageSettings>;
-    customStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    customStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
 }, {
     viewBox: import("vue").Ref<string>;
     path: import("vue").Ref<string>;
@@ -57,14 +57,14 @@ declare const _default: import("vue").DefineComponent<{
         default: number;
     };
     imageSettings: import("vue").PropType<import("../ele-qr-code/types").ImageSettings>;
-    customStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    customStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
 }>> & {
     onDone?: (() => any) | undefined;
 }, {
     size: number;
+    margin: number;
     level: import("../ele-qr-code/types").Level;
     bgColor: string;
     fgColor: string;
-    margin: number;
 }, {}>;
 export default _default;

package/es/ele-split-panel/index.d.ts

@@ -3,10 +3,10 @@ declare const _default: import("vue").DefineComponent<{
     minSize: NumberConstructor;
     maxSize: NumberConstructor;
     space: StringConstructor;
-    customStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
-    bodyStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    customStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     allowCollapse: BooleanConstructor;
-    collapseStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    collapseStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     collapse: BooleanConstructor;
     vertical: BooleanConstructor;
     reverse: BooleanConstructor;
@@ -33,10 +33,10 @@ declare const _default: import("vue").DefineComponent<{
     minSize: NumberConstructor;
     maxSize: NumberConstructor;
     space: StringConstructor;
-    customStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
-    bodyStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    customStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     allowCollapse: BooleanConstructor;
-    collapseStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    collapseStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     collapse: BooleanConstructor;
     vertical: BooleanConstructor;
     reverse: BooleanConstructor;

package/es/ele-split-panel/props.d.ts

@@ -1,5 +1,4 @@
 import type { PropType, ExtractPropTypes } from 'vue';
-import type { StyleValue } from '../ele-app/types';
 /**
  * 属性
  */
@@ -8,10 +7,10 @@ export declare const splitPanelProps: {
     minSize: NumberConstructor;
     maxSize: NumberConstructor;
     space: StringConstructor;
-    customStyle: PropType<StyleValue>;
-    bodyStyle: PropType<StyleValue>;
+    customStyle: PropType<Partial<import("vue").CSSProperties>>;
+    bodyStyle: PropType<Partial<import("vue").CSSProperties>>;
     allowCollapse: BooleanConstructor;
-    collapseStyle: PropType<StyleValue>;
+    collapseStyle: PropType<Partial<import("vue").CSSProperties>>;
     collapse: BooleanConstructor;
     vertical: BooleanConstructor;
     reverse: BooleanConstructor;

package/es/ele-table/style/index.scss

@@ -29,6 +29,7 @@
       border-color: eleVar('table', 'border-color');
       border-bottom-width: 1px;
       vertical-align: middle;
+      box-sizing: border-box;
       text-align: left;
     }
 

package/es/ele-tabs/index.js

@@ -105,6 +105,7 @@ const _sfc_main = defineComponent({
     };
     const unbindDragSort = () => {
       current.sortIns && current.sortIns.destroy();
+      current.sortIns = null;
     };
     const onContextmenu = (e) => {
       const el = e.target;
@@ -231,7 +232,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.items, (item, index2) => {
         return openBlock(), createBlock(_component_ElTabPane, mergeProps({
           key: index2 + "-" + item.name
-        }, _ctx.omit(item, ["meta"])), createSlots({
+        }, _ctx.omit(item, ["slot", "meta"])), createSlots({
           label: withCtx(() => [
             createVNode(_component_TabTitle, {
               ref_for: true,
@@ -265,10 +266,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           ]),
           _: 2
         }, [
-          item.name && _ctx.$slots[item.name] ? {
+          item.name && _ctx.$slots[item.slot || item.name] ? {
             name: "default",
             fn: withCtx(() => [
-              renderSlot(_ctx.$slots, item.name, { item })
+              renderSlot(_ctx.$slots, item.slot || item.name, { item })
             ]),
             key: "0"
           } : void 0

package/es/ele-tabs/types/index.d.ts

@@ -5,6 +5,9 @@ import type { DropdownItem } from '../../ele-dropdown/types';
  * 页签数据
  */
 export interface TabPaneItem extends ElTabPaneProps {
+    /** 插槽名称 */
+    slot?: string;
+    /** 元数据 */
     meta?: any;
 }
 /**

package/es/ele-text/index.d.ts

@@ -11,7 +11,7 @@ declare const _default: import("vue").DefineComponent<{
     italic: BooleanConstructor;
     icon: import("vue").PropType<import("./types").TextIcon>;
     iconProps: import("vue").PropType<import("../ele-app/types").ElIconProps>;
-    iconStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    iconStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
 }, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     tag: {
         type: StringConstructor;
@@ -25,11 +25,11 @@ declare const _default: import("vue").DefineComponent<{
     italic: BooleanConstructor;
     icon: import("vue").PropType<import("./types").TextIcon>;
     iconProps: import("vue").PropType<import("../ele-app/types").ElIconProps>;
-    iconStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    iconStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
 }>>, {
     tag: string;
-    deleted: boolean;
     underline: boolean;
+    deleted: boolean;
     strong: boolean;
     italic: boolean;
 }, {}>;

package/es/ele-text/props.d.ts

@@ -1,5 +1,5 @@
 import type { PropType, ExtractPropTypes } from 'vue';
-import type { StyleValue, ElIconProps } from '../ele-app/types';
+import type { ElIconProps } from '../ele-app/types';
 import type { TextType, TextSize, TextIcon } from './types';
 /**
  * 属性
@@ -17,7 +17,7 @@ export declare const textProps: {
     italic: BooleanConstructor;
     icon: PropType<TextIcon>;
     iconProps: PropType<ElIconProps>;
-    iconStyle: PropType<StyleValue>;
+    iconStyle: PropType<Partial<import("vue").CSSProperties>>;
 };
 export type TextProps = ExtractPropTypes<typeof textProps>;
 export type TextPropKeys = Array<keyof typeof textProps>;

package/es/ele-toolbar/index.d.ts

@@ -5,9 +5,9 @@ declare const _default: import("vue").DefineComponent<{
         type: import("vue").PropType<import("./types").ToolbarTheme>;
         default: string;
     };
-    titleStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
-    bodyStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
-    toolsStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    titleStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    toolsStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
 }, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     title: StringConstructor;
     subtitle: StringConstructor;
@@ -15,9 +15,9 @@ declare const _default: import("vue").DefineComponent<{
         type: import("vue").PropType<import("./types").ToolbarTheme>;
         default: string;
     };
-    titleStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
-    bodyStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
-    toolsStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
+    titleStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    toolsStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
 }>>, {
     theme: import("./types").ToolbarTheme;
 }, {}>;

package/es/ele-toolbar/props.d.ts

@@ -1,5 +1,4 @@
 import type { PropType, ExtractPropTypes } from 'vue';
-import type { StyleValue } from '../ele-app/types';
 import type { ToolbarTheme } from './types';
 /**
  * 属性
@@ -11,8 +10,8 @@ export declare const toolbarProps: {
         type: PropType<ToolbarTheme>;
         default: string;
     };
-    titleStyle: PropType<StyleValue>;
-    bodyStyle: PropType<StyleValue>;
-    toolsStyle: PropType<StyleValue>;
+    titleStyle: PropType<Partial<import("vue").CSSProperties>>;
+    bodyStyle: PropType<Partial<import("vue").CSSProperties>>;
+    toolsStyle: PropType<Partial<import("vue").CSSProperties>>;
 };
 export type ToolbarProps = ExtractPropTypes<typeof toolbarProps>;

package/es/ele-tooltip/index.d.ts

@@ -1,7 +1,7 @@
-import type { StyleValue, ElTooltipProps, ElTooltipInstance, ElPopperInstance } from '../ele-app/types';
+import type { ElTooltipProps, ElTooltipInstance, ElPopperInstance } from '../ele-app/types';
 import type { TooltipEmits } from './props';
 declare const _default: import("vue").DefineComponent<{
-    bodyStyle: import("vue").PropType<StyleValue>;
+    bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     bg: StringConstructor;
     arrowBg: StringConstructor;
     keepAlive: BooleanConstructor;
@@ -130,7 +130,7 @@ declare const _default: import("vue").DefineComponent<{
     onPopOpen: (e: any) => void;
     onPopClose: (e: any) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, TooltipEmits, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    bodyStyle: import("vue").PropType<StyleValue>;
+    bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     bg: StringConstructor;
     arrowBg: StringConstructor;
     keepAlive: BooleanConstructor;