perf: 菜单增加操作列

fast-crud · Dec 14, 2022 · 4b328ce · 4b328ce
1 parent 871f852
commit 4b328ce
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 20 deletions.
diff --git a/docs/zh/api/common-options.md b/docs/zh/api/common-options.md
@@ -97,6 +97,14 @@ component:{
         type:"", //a-button，el-button的类型
         style:{},
         disabled:false,
+        tooltip:{ //tooltip的属性
+            title //a-tooltip 提示内容
+            slots:{ //tooltip插槽
+                default(){
+                    return "n-tooltip的提示内容"
+                }
+            }
+        },
         ...// a-button,el-button的其他配置
     },
 }

diff --git a/packages/fast-crud/src/components/basic/fs-button.tsx b/packages/fast-crud/src/components/basic/fs-button.tsx
@@ -119,10 +119,11 @@ export default defineComponent({
     const computeTooltipProps = computed(() => {
       return _.omit(props.tooltip, "slots");
     });
+    const triggerSlotName = ui.tooltip.trigger;
     return () => {
       const slots = {
         ...props.tooltip?.slots,
-        default: renderBtn
+        [triggerSlotName]: renderBtn
       };
       return <tooltipComp {...computeTooltipProps.value}>{slots}</tooltipComp>;
     };

diff --git a/packages/fast-crud/src/components/crud/fs-row-handle.vue b/packages/fast-crud/src/components/crud/fs-row-handle.vue
@@ -251,12 +251,12 @@ export default defineComponent({
 .fs-row-handle {
   // display: flex ; // 这里不能用flex，否则会破坏align:center配置
   flex-wrap: wrap;
-  .row-handle-btn {
+  .el-button + .el-button {
+    margin-left: 2px;
+  }
+  & > * {
     margin: 2px;
     display: inline-flex;
-    &.el-button {
-      margin: 2px;
-    }
   }
   .fs-row-handle-dropdown-item {
     display: flex;

diff --git a/packages/ui/ui-interface/src/ui-interface.ts b/packages/ui/ui-interface/src/ui-interface.ts
@@ -7,7 +7,7 @@ export interface FormCI {
   inlineLayout: Object;
   resetWrap: Function;
   validateWrap: Function;
-  transformValidateErrors: (e:Error) => { [key: string]: any }
+  transformValidateErrors: (e: Error) => { [key: string]: any };
 }
 export interface SelectCI extends CI {
   modelValue;
@@ -53,16 +53,16 @@ export interface DialogCI extends CI {
   footer: Function;
   buildOnClosedBind: Function;
   customClass;
-  titleSlotName?:string;
-  buildWidthBind?:any;
-  buildInitBind?:any;
+  titleSlotName?: string;
+  buildWidthBind?: any;
+  buildInitBind?: any;
 }
 
 export interface DrawerCI extends CI {
   visible;
   customClass;
   width;
-  hasContentWrap?:string;
+  hasContentWrap?: string;
 }
 
 export interface TableColumnCI extends CI {
@@ -73,7 +73,7 @@ export interface TableColumnCI extends CI {
 }
 
 export interface TableCI extends CI {
-  defaultRowKey?: (string|((rowData:any)=>any));
+  defaultRowKey?: string | ((rowData: any) => any);
   data;
   fixedHeaderNeedComputeBodyHeight: boolean;
   headerDomSelector: string; //用于计算高度
@@ -133,8 +133,8 @@ export interface MessageCI extends CI {
   error;
   warn;
   info;
-  instance:any;
-  getInstance?:any
+  instance: any;
+  getInstance?: any;
 }
 
 export type MessageBoxContextType = {
@@ -148,17 +148,17 @@ export type MessageBoxOpenType = (context: MessageBoxContextType) => Promise<voi
 export interface MessageBoxCI extends CI {
   open: MessageBoxOpenType;
   confirm: MessageBoxOpenType;
-  instance:any;
-  getInstance?:any
+  instance: any;
+  getInstance?: any;
 }
 export interface NotificationCI extends CI {
   open;
   success;
   error;
   warn;
   info;
-  instance:any;
-  getInstance?:any
+  instance: any;
+  getInstance?: any;
 }
 export interface IconCI extends CI {
   isComponent: boolean;
@@ -190,7 +190,7 @@ export interface FormWrapperCI extends CI {
   buildWidthBind: (is, width: any) => {};
   buildInitBind: (is) => {};
   buildInnerBind: (opts: any) => {};
-  hasContentWrap?: (is) => string|undefined;
+  hasContentWrap?: (is) => string | undefined;
 }
 export interface DatePickerCI extends CI {
   modelValue;

diff --git a/packages/ui/ui-naive/package.json b/packages/ui/ui-naive/package.json
@@ -16,10 +16,10 @@
     "@fast-crud/ui-interface": "^1.6.1"
   },
   "peerDependencies": {
-    "@ant-design/icons-vue": "^6.0.1",
     "@fast-crud/fast-crud": "^2.*"
   },
   "devDependencies": {
+    "@ant-design/icons-vue": "^6.0.1",
     "@rollup/plugin-strip": "^3.0.1",
     "@rollup/plugin-typescript": "^10.0.1",
     "@typescript-eslint/eslint-plugin": "^5.46.1",

diff --git a/packages/ui/ui-naive/src/icons.js → packages/ui/ui-naive/src/icons.ts b/packages/ui/ui-naive/src/icons.js → packages/ui/ui-naive/src/icons.ts
@@ -29,6 +29,7 @@ import {
   DownOutlined,
   EyeOutlined,
   QuestionCircleOutlined
+  // @ts-ignore
 } from "@ant-design/icons-vue";
 
 const icons = {
@@ -64,7 +65,7 @@ const icons = {
   QuestionCircleOutlined
 };
 export default function (app) {
-  for (let key in icons) {
+  for (const key in icons) {
     app.component(key, icons[key]);
   }
 }