@elementplus-kit/uikit 1.0.3 → 1.0.5

package/components/button/src/index.ts

@@ -1,9 +1,16 @@
-import { defineComponent, h } from "vue";
-import { ElButton } from "element-plus";
+import { defineComponent, h, PropType } from "vue";
+import {
+  ElButton,
+  ElDropdown,
+  ElDropdownMenu,
+  ElDropdownItem,
+  buttonProps,
+} from "element-plus";
 
-// import '../style/index.scss';
+import "../style/index.scss";
 import { typeActiveMap } from "./constants.ts";
 import { has, isBoolean, isFunction, isArray } from "lodash-es";
+import { tr } from "element-plus/es/locales.mjs";
 export default defineComponent({
   props: {
     params: {
@@ -11,18 +18,39 @@ export default defineComponent({
       type: Object,
       default: () => ({}),
     },
-    // modelValue: {
-    //   type: Object,
-    //   default: {}
-    // },
-    buttonOptions: {
+    btnOptions: {
       type: Array,
       default: () => [],
     },
-    // 权限函数
-    hasPermission: {
+    // 权限验证函数
+    permit: {
       type: Function,
-      default: () => true,
+    },
+    size: {
+      type: String as PropType<"large" | "default" | "small">,
+      default: undefined,
+    },
+    plain: {
+      type: Boolean,
+      default: undefined,
+    },
+    text: {
+      type: Boolean,
+      default: undefined,
+    },
+    link: {
+      type: Boolean,
+      default: undefined,
+    },
+    // 折叠
+    fold: {
+      type: Boolean,
+      default: false,
+    },
+    // 折叠数量
+    foldNum: {
+      type: Number,
+      default: 0,
     },
     // // 权限函数
     // hasRole: {
@@ -30,61 +58,206 @@ export default defineComponent({
     //   default: () => true
     // },
   },
-
+  emits: ["btnAction"],
   setup(props, { emit, slots, attrs, expose }) {
-    // const slotsList = ["active", "btn-left", "btn-right"];
     // console.log('slots', slots);
     // console.log('attrs', attrs);
 
-    // 解析插槽
+    // 解析按钮属性
     const getAttrs = (item) => {
-      let defaultAttrs = {};
-      // const { alias, hasPermission, vIf, ...p } = item;
-      if (item?.alias && typeActiveMap[item.alias]) {
-        defaultAttrs = typeActiveMap[item.alias];
-      }
+      let defaultAttrs = {
+        size: props.size,
+        plain: props.plain,
+        text: props.text,
+        link: props.link,
+        class: `c-btn-alias-${item.alias || ""}`,
+      };
+
+      // 默认按钮类型 用样式控制?
+      // if (item?.alias && typeActiveMap[item.alias]) {
+      //   defaultAttrs = {
+      //     ...typeActiveMap[item.alias],
+      //     ...defaultAttrs,
+      //   };
+      // }
+
       // 过滤掉非elbutton属性
-      defaultAttrs = {
-        ...defaultAttrs,
-        ...item,
+      const filterAttrsList = ["label", "alias", "permit", "vIf", "disable"];
+
+      Object.keys(item).map((key) => {
+        if (!filterAttrsList.includes(key)) {
+          defaultAttrs[key] = item[key];
+        }
+      });
+
+      // 处理禁用
+      if (isBoolean(item.disable)) {
+        defaultAttrs.disabled = item.disable;
+      }
+      if (
+        isFunction(item.disable) &&
+        item.disable(props.params) !== undefined
+      ) {
+        defaultAttrs.disabled = item.disable(props.params);
+      }
+      return defaultAttrs;
+    };
+    // 解析下拉菜单属性
+    const getDropdownAttrs = (item) => {
+      const obj = getAttrs(item);
+      const defaultAttrs = {
+        splitButton: true,
       };
+      // 过滤下拉菜单属性
+      const l = [
+        "type",
+        "size",
+        "splitButton",
+        "disabled",
+        "placement",
+        "effect",
+        "trigger",
+      ];
+      l.forEach((key) => {
+        if (obj[key] !== undefined) {
+          defaultAttrs[key] = obj[key];
+        }
+      });
       return defaultAttrs;
     };
-    const render = () => {
-      console.log("render 执行");
+    // 过滤权限与 vIf
+    const filterOptions = () => {
+      const list = [];
       // 过滤权限
-      let list = [];
-      props.buttonOptions.map((item) => {
-        if (has(item, "permission") && isArray(item.permission)) {
-          if (props.hasPermission && props.hasPermission(item.permission)) {
+      props.btnOptions.map((item) => {
+        if (
+          isArray(item.permit) &&
+          item.permit.length > 0 &&
+          isFunction(props.permit)
+        ) {
+          if (props.permit(item.permit)) {
             list.push(item);
           }
         } else {
           list.push(item);
         }
       });
-
-      const listR = [];
+      const list2 = [];
+      // 过滤 vIf
       list.map((item) => {
-        // if (has(item, "vIf")) {
-          if (has(item, "vIf") && isFunction(item.vIf) && item.vIf(props.params) !== undefined) {
-            console.log('aaaaaaaaaa', item.vIf(props.params));
-            if (item.vIf(props.params)) {
-              listR.push(item);
-            }
-          } else {
-            listR.push(item);
+        if (
+          has(item, "vIf") &&
+          isFunction(item.vIf) &&
+          item.vIf(props.params) !== undefined
+        ) {
+          if (item.vIf(props.params)) {
+            list2.push(item);
           }
-        // } else {
-        //   listR.push(item);
-        // }
+        } else {
+          list2.push(item);
+        }
       });
-      console.log("🚀 ~ render ~ listR:", listR);
-      return listR.map((item) => {
-        return h(ElButton, getAttrs(item), {
-          default: () => item?.name,
-        });
+      return list2;
+    };
+    // 按钮单个生成函数
+    const createBtn = (item) => {
+      return h(
+        ElButton,
+        {
+          ...getAttrs(item),
+          onClick: () => {
+            emit("btnAction", item.alias, props.params);
+          },
+        },
+        {
+          default: () => item?.label,
+        }
+      );
+    };
+    // 下拉菜单生成函数
+    const createDropdown = (finalList) => {
+      const dropdownList = []; // 不折叠的按钮
+      const dropdownMain = []; // 下拉占位
+      const dropdownItemList = []; // 折叠的按钮
+
+      finalList.map((itm, idx) => {
+        if (idx < props.foldNum) {
+          dropdownList.push(itm);
+        } else if (idx === props.foldNum) {
+          dropdownMain.push(itm);
+        } else {
+          dropdownItemList.push(itm);
+        }
       });
+      // 处理只有一个下拉按钮的情况
+      if (dropdownMain.length > 0 && dropdownItemList.length === 0) {
+        dropdownList.push(dropdownMain[0]);
+      }
+
+      // 最终渲染的vdom
+      let renderVdom = [];
+      // 展示按钮vdom
+      const butsVdom = dropdownList.map((item) => {
+        return createBtn(item);
+      });
+
+      // 合并参数
+      if (butsVdom.length > 0) {
+        renderVdom = renderVdom.concat(butsVdom);
+      }
+
+      if (dropdownMain.length > 0 && dropdownItemList.length > 0) {
+        // 下拉菜单vdom
+        const dropdownVdom = h(
+          ElDropdown,
+          {
+            ...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);
+            },
+          },
+          {
+            default: () => {
+              return dropdownMain[0].label;
+            },
+            dropdown: () => {
+              return dropdownItemList.map((item) => {
+                return h(
+                  ElDropdownItem,
+                  {
+                    command: item.alias,
+                  },
+                  {
+                    default: () => item?.label,
+                  }
+                );
+              });
+            },
+          }
+        );
+        renderVdom = renderVdom.concat(dropdownVdom);
+      }
+      return renderVdom;
+    };
+
+    const render = () => {
+      const finalList = filterOptions(); // 最终列表
+      // 是否折叠 折叠
+      if (props.fold) {
+        return createDropdown(finalList);
+      } else {
+        // 不折叠
+        return finalList.map((item) => {
+          return createBtn(item);
+        });
+      }
     };
     return () => render();
   },

package/components/button/style/index.scss

@@ -0,0 +1,3 @@
+.el-button + .el-dropdown {
+  margin-left: 10px;
+}

package/components/form/src/FormItem.ts

@@ -23,7 +23,7 @@ import {
   ElText,
 } from "element-plus";
 
-import { isFunction, has } from "lodash-es";
+import { isFunction, isBoolean } from "lodash-es";
 import { formTypeCfg } from "./constants";
 import { formatEventName } from "./utils";
 
@@ -106,9 +106,12 @@ export default defineComponent({
     // 获取禁用状态
     const getDisabled = () => {
       let disabled = false;
-      if (has(attrs.value, "disabled") && isFunction(attrs.value.disabled)) {
+      if (isFunction(attrs.value?.disabled)) {
         disabled = attrs.value.disabled(model.value);
       }
+      if (isBoolean(attrs.value?.disabled)) { // 在 attrs 后面结构, 也要处理直接赋值的情况，不然会覆盖
+        disabled = attrs.value.disabled;
+      }
       // 全部只读
       if (allReadonly.value) {
         disabled = true;
@@ -137,14 +140,6 @@ export default defineComponent({
       return typeAttrs;
     };
 
-    // 获取事件和属性
-    const getEventsAndAttrs = () => {
-      return {
-        ...handleEvents(),
-        ...handleAttrs(),
-      };
-    };
-
     // 设置元素 Ref
     const setElRef = (vEl: any, value: string) => {
       props.optionsRef[`${value}Ref`] = vEl;
@@ -353,31 +348,6 @@ export default defineComponent({
     };
 
     const renderType = () => {
-      // // 有下拉
-      // if (['cascader', 'select-v2', 'tree-select'].includes(type)) {
-      //   defailtAttrs.options = options.value
-      // }
-      // if (['tree-select'].includes(type)) {
-      //   defailtAttrs.data = options.value
-      // }
-
-      // // 只读转禁用
-      // if ([''].includes(type)) {
-      // }
-      // if (['condition'].includes(type)) {
-      //   return getType(type.value)
-      // } else {
-      //   return h(getType(type.value), {
-      //     modelValue: model.value[prop.value],
-      //     'onUpdate:modelValue': (val) => (model.value[prop.value] = val),
-      //     ...attrs.value,
-      //   })
-      // }
-      // return h(ElInput, {
-      //   vModel: model.value[prop.value],
-      //   ...attrs,
-      // })
-
       // 自动启动插槽
       if (formSlots[prop.value]) {
         return getFormType["slot"]();
@@ -397,16 +367,9 @@ export default defineComponent({
       // 非插槽类型
       return getFormType[type.value]();
     };
-    // 处理事件
-    const getAttribute = () => {
-      return {};
-    };
-    // 处理属性
-    const getEvents = () => {
-      return {};
-    };
 
     const render = () => {
+      const renderTypeVdom = renderType();
       return h(
         ElFormItem,
         {
@@ -424,7 +387,7 @@ export default defineComponent({
           ...formItem.value,
         },
         {
-          default: () => renderType(),
+          default: () => renderTypeVdom,
         }
       );
     };

package/components/form/src/index.ts

@@ -14,7 +14,7 @@ import zhCn from "element-plus/es/locale/lang/zh-cn";
 import CFormItem from "./FormItem.ts";
 import { has, isArray, isBoolean, isFunction, isNumber } from "lodash-es";
 import { getEmits } from "./constants"; // 获取所有的事件
-import '../style/index.scss'
+import "../style/index.scss";
 const propsAttrs = {
   // 表单数据
   model: { type: Object, default: () => ({}) },
@@ -105,18 +105,18 @@ export default defineComponent({
     // 渲染表单项
     const renderFormItem = () => {
       // 过滤权限
-      const list = []
+      const list = [];
       formOptions.value.map((item) => {
-        // 处理 vIf 显示隐藏
-        if(has(item, 'vIf')) {
-          if (isFunction(item.vIf) && item.vIf(props.model, props.params)) {
-            list.push(item)
+        // 处理 vIf true 显示 false 隐藏
+        if (isFunction(item?.vIf) && item.vIf(props.model, props.params) !== undefined) {
+          if (item.vIf(props.model, props.params)) {
+            list.push(item);
           }
         } else {
-          list.push(item)
+          list.push(item);
         }
-      })
-      return formOptions.value.map((item) => {
+      });
+      return list.map((item) => {
         // const { label, prop, type, required, col, formItem, attrs } = item
         // const { label, prop, type, required, col, formItem, attrs, ...args } = item
         const rFormItem = () => {
@@ -151,7 +151,7 @@ export default defineComponent({
             {
               class: "c-col",
               span: has(item, "col")
-                ? col
+                ? item.col
                 : col?.value
                 ? col?.value
                 : isLayout.value
@@ -170,6 +170,7 @@ export default defineComponent({
 
     // 渲染表单
     const renderForm = () => {
+      console.log("$attrs", $attrs);
       return h(
         ElConfigProvider,
         {
@@ -182,6 +183,7 @@ export default defineComponent({
               {
                 ref: cFormFnRef,
                 ...$attrs,
+                model: model.value,
                 class: allReadonly.value ? "isReadonly c-form" : "c-form", // 放在 $attrs 后面可自动合并 放在 $attrs 前面会被 $attrs.class 覆盖， h函数渲染的是标签就会覆盖 是组件就会合并不用管顺序
               },
               {

package/components/table/src/index.ts

@@ -132,11 +132,11 @@ export default defineComponent({
       const rColumn = (columns, list) => {
         columns.map((item) => {
           const { children, ...p } = item;
-          // 处理 vIf
+          // 处理 vIf true 显示 false 隐藏
           if (
             isFunction(item.vIf) &&
             item.vIf(props.params) !== undefined &&
-            item.vIf(props.params)
+            !item.vIf(props.params)
           ) {
             return;
           }

package/package.json

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

package/vite.config.ts

@@ -0,0 +1,26 @@
+import { defineConfig } from 'vite'
+import vue from '@vitejs/plugin-vue'
+import vueJsx from '@vitejs/plugin-vue-jsx'
+import dts from 'vite-plugin-dts'
+import { resolve } from 'path'
+
+export default defineConfig({
+  plugins: [
+    vue(),
+    vueJsx(),
+    // dts({
+    //   rollupTypes: false,
+    //   tsconfigPath: './tsconfig.json',
+    // }),
+  ],
+  build: {
+    lib: {
+      entry: 'components/index.ts',
+      name: 'ElementPlusKit',
+      fileName: 'index',
+    },
+    rollupOptions: {
+      external: ['vue', 'element-plus'],
+    },
+  },
+})