@elementplus-kit/uikit 1.11.0 → 1.12.0

package/components/button/src/index.ts

@@ -102,12 +102,16 @@ export default defineComponent({
       const defaultAttrs = {
         splitButton: true,
       };
+      // 禁用时有下拉不禁用
+      // if(item.disabled && dropdownItemList.length > 0) {
+      //   defaultAttrs.class = `is-disabled-down ${item.class}`
+      // }
       // 过滤下拉菜单属性
       const l = [
         "type",
         "size",
         "splitButton",
-        "disabled",
+        // "disabled",
         "placement",
         "effect",
         "trigger",
@@ -218,29 +222,19 @@ export default defineComponent({
           {
             ...getDropdownAttrs(dropdownMain[0]),
             class: "c-btn-dropdown",
-            buttonProps: getAttrs(dropdownMain[0]),
-            splitButton: true,
-            // splitButton: dropdownItemList.length > 0,
-            onClick: () => {
-              emit("btnAction", dropdownMain[0].alias, props.params);
-            },
-            onCommand: (command: string) => {
-              emit("btnAction", command, props.params);
-            },
+            popperClass: "c-btn-dropdown-popper",
           },
           {
-            default: () => {
-              return dropdownMain[0].label;
-            },
+            default: () => createBtn(dropdownMain[0]),
             dropdown: () => {
               return dropdownItemList.map((item) => {
                 return h(
                   ElDropdownItem,
                   {
-                    command: item.alias,
+                    // command: item.alias,
                   },
                   {
-                    default: () => item?.label,
+                    default: () => createBtn(item),
                   },
                 );
               });
@@ -264,14 +258,25 @@ export default defineComponent({
       } else if (isString(props.fold)) {
         isFold = true;
       }
-      if (isFold) {
-        return createDropdown(finalList);
-      } else {
-        // 不折叠
-        return finalList.map((item) => {
-          return createBtn(item);
-        });
-      }
+
+      return h(
+        "div",
+        {
+          class: "c-button",
+        },
+        {
+          default: () => {
+            if (isFold) {
+              return createDropdown(finalList);
+            } else {
+              // 不折叠
+              return finalList.map((item) => {
+                return createBtn(item);
+              });
+            }
+          },
+        },
+      );
     };
     return () => render();
   },

package/components/button/style/index.scss

@@ -1,3 +1,44 @@
-.el-button + .el-dropdown {
-  margin-left: 10px;
+.c-button {
+  display: inline-block;
+  .el-button + .el-dropdown {
+    margin-left: 10px;
+  }
+  > .el-button + .el-button {
+    margin-left: 10px;
+  }
+  .c-btn-dropdown {
+    .el-button-group {
+      > .el-button:nth-child(1) {
+        // 格式第一个按钮
+        padding: 0;
+        border: none;
+        background-color: transparent;
+        .el-button {
+          border-bottom-right-radius: 0;
+          border-top-right-radius: 0;
+        }
+      }
+    }
+    // 按钮聚焦外轮廓阴影
+    .el-button:focus-visible {
+      outline: none;
+    }
+  }
+}
+// 下拉悬浮窗
+.c-btn-dropdown-popper {
+  .el-dropdown-menu__item {
+    padding: 0;
+  }
+  .el-button {
+    width: 100%;
+    border: none;
+    border-radius: 0;
+  }
+  .el-dropdown-menu__item + .el-dropdown-menu__item {
+    margin-top: 1px;
+  }
+}
+.c-btn-dropdown-popper.is-light {
+  border: none;
 }

package/components/table/src/index.ts

@@ -15,10 +15,6 @@ import {
 } from "./constants.ts";
 import { isArray, isObject, isFunction } from "lodash-es";
 const tableAttrs = {
-  module: {
-    type: Object,
-    default: () => {},
-  },
   params: {
     // 额外业务全局参数
     type: Object,

package/components/table/src/type.ts

@@ -12,6 +12,8 @@ export type TableProps = Expand<Partial<TableAttrs>> &
 
 // 表格项属性
 export type TableColumnProps = {
+  label: string;
+  prop?: string | undefined;
   vIf?: (params: any) => boolean;
   render?: (scope: any) => any;
   options?: Array<{ label: string; value: any }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elementplus-kit/uikit",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "description": "",
   "main": "./components/index.ts",
   "peerDependencies": {