vue-devui 1.0.0-beta.10 → 1.0.0-beta.14

package/README.md

@@ -1,6 +1,6 @@
 <p align="center">
   <a href="https://devui.design/home" target="_blank" rel="noopener noreferrer">
-    <img alt="DevUI Logo" src="public/logo.svg?sanitize=true" width="180" style="max-width:100%;">
+    <img alt="DevUI Logo" src="https://github.com/DevCloudFE/vue-devui/raw/dev/packages/devui-vue/public/logo.svg" width="180" style="max-width:100%;">
   </a>
 </p>
 
@@ -8,7 +8,7 @@ Vue DevUI 是 Vue3 版本的 DevUI 组件库，基于 [https://github.com/devclo
 
 DevUI 官方网站：[https://devui.design](https://devui.design)
 
-# 当前状态: Beta
+## 当前状态: Beta
 
 该项目还处于孵化和演进阶段，欢迎大家参与到 Vue DevUI 项目的建设中来！🎉🎉
 
@@ -18,11 +18,11 @@ DevUI 官方网站：[https://devui.design](https://devui.design)
 - ⭐ 参与到开源社区中来
 - 🎊 结识一群热爱学习、热爱开源的朋友
 
-[贡献指南](https://gitee.com/devui/vue-devui/wikis/【必看】快速开始)
+[贡献指南](https://github.com/DevCloudFE/vue-devui/wiki/%E8%B4%A1%E7%8C%AE%E6%8C%87%E5%8D%97)
 
-# 快速开始
+## 快速开始
 
-## 1 安装依赖
+### 1 安装依赖
 
 ```
 yarn(推荐)
@@ -32,7 +32,7 @@ or
 npm i
 ```
 
-## 2 启动
+### 2 启动
 
 ```
 yarn dev(推荐)
@@ -42,11 +42,11 @@ or
 npm run dev
 ```
 
-## 3 访问
+### 3 访问
 
 [http://localhost:3000/](http://localhost:3000/)
 
-## 4 生产打包
+### 4 生产打包
 
 ```
 yarn build(推荐)
@@ -56,16 +56,17 @@ or
 npm run build
 ```
 
-# 使用 Vue DevUI
+## 使用 Vue DevUI
 
-## 1. 安装
+### 1. 安装
 
 ```
 yarn add vue-devui
 ```
 
-## 2. 全量引入
+### 2. 全量引入
 
+在`main.ts`文件中编写以下代码：
 ```
 import { createApp } from 'vue'
 import App from './App.vue'
@@ -80,10 +81,11 @@ createApp(App)
 .mount('#app')
 ```
 
-## 3. 按需引入
+### 3. 按需引入
 
 除了全量引入，我们也支持单个组件按需引入。
 
+在`main.ts`文件中编写以下代码：
 ```
 import { createApp } from 'vue'
 import App from './App.vue'
@@ -99,7 +101,32 @@ createApp(App)
 .mount('#app')
 ```
 
-## 4. 使用
+### 4. 配置自动按需引入`unplugin-vue-components`（推荐）
+
+配置`unplugin-vue-components`插件可以无需引入Vue DevUI就可以直接按需使用其中的组件，具体使用方式如下：
+
+在`vite.config.ts`文件中添加以下代码：
+```
+import Components from 'unplugin-vue-components/vite'
+import { DevUiResolver } from 'unplugin-vue-components/resolvers'
+
+export default defineConfig({
+  plugins: [
+    vue(),
+
+    // 新增
+    Components({
+      resolvers: [
+        DevUiResolver()
+      ]
+    })
+  ]
+})
+```
+
+配置了以上插件，就可以直接在代码中使用`Vue DevUI`的组件，而无需在`main.ts`文件中引入`Vue DevUI`。
+
+### 5. 使用
 
 ```
 <template>
@@ -107,13 +134,13 @@ createApp(App)
 </template>
 ```
 
-# 图标库
+## 图标库
 
-图标库可以使用[DevUI图标库](https://devui.design/icon/ruleResource)，也可以使用第三方图标库，比如：iconfont。
+图标库推荐使用[DevUI图标库](https://devui.design/icon/ruleResource)，也可以使用第三方图标库，比如：iconfont。
 
-## 使用DevUI图标库
+### 使用DevUI图标库
 
-### 安装
+#### 安装
 
 ```
 yarn add @devui-design/icons(推荐)
@@ -123,7 +150,7 @@ or
 npm i @devui-design/icons
 ```
 
-### 引入
+#### 引入
 
 在`main.ts`文件中，编写以下代码：
 
@@ -131,42 +158,32 @@ npm i @devui-design/icons
 import '@devui-design/icons/icomoon/devui-icon.css'
 ```
 
-### 使用
+#### 使用
 
 ```
 <d-icon name="love" color="red"></d-icon>
 ```
 
-## 使用第三方图标库
+## Contributors ✨
 
-如果有第三方图标库，可以用类似的方式引入。
+Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
 
-### 引入
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tr>
+    <td align="center"><a href="https://juejin.cn/user/712139267650141"><img src="https://avatars.githubusercontent.com/u/9566362?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kagol</b></sub></a><br /><a href="#maintenance-kagol" title="Maintenance">🚧</a> <a href="https://github.com/DevCloudFE/vue-devui/commits?author=kagol" title="Code">💻</a> <a href="https://github.com/DevCloudFE/vue-devui/commits?author=kagol" title="Documentation">📖</a></td>
+  </tr>
+</table>
 
-在`main.ts`文件中，编写以下代码：
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
 
-```
-import 'your-folder/my-icon.css'
-```
-
-### 使用
-
-```
-<d-icon classPrefix="my-icon" name="love" color="red"></d-icon>
-```
-
-其中的`classPrefix`参数的值，应该和你的字体图标样式文件`my-icon.css`里定义的样式前缀保持一致。
-
-比如`my-icon.css`里的图标样式：
-
-```css
-.my-icon-branch-node:before {
-	content: "\E001";
-}
-```
+<!-- ALL-CONTRIBUTORS-LIST:END -->
 
-那么`classPrefix`就是`my-icon`。
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
 
-# License
+## License
 
-[MIT](https://gitee.com/devui/vue-devui/blob/dev/LICENSE)
+[MIT](https://github.com/DevCloudFE/vue-devui/blob/dev/LICENSE)

package/accordion/index.es.js

@@ -1,4 +1,6 @@
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
@@ -14,7 +16,8 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
-import { defineComponent, toRefs, computed, createVNode, Fragment, mergeProps, resolveComponent, onMounted, watch } from "vue";
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import { createVNode, getCurrentInstance, defineComponent, toRefs, inject, computed, Fragment, mergeProps, resolveComponent, createTextVNode, provide, onMounted, watch } from "vue";
 const accordionProps = {
   data: {
     type: Array,
@@ -26,8 +29,8 @@ const accordionProps = {
   disabledKey: { type: String, default: "disabled" },
   activeKey: { type: String, default: "active" },
   openKey: { type: String, default: "open" },
-  menuItemTemplate: { type: String, default: "" },
-  itemTemplate: { type: String, default: "" },
+  menuItemTemplate: { type: Boolean, default: true },
+  itemTemplate: { type: Boolean, default: true },
   menuToggle: {
     type: Function,
     default: null
@@ -43,9 +46,9 @@ const accordionProps = {
   restrictOneOpen: { type: Boolean, default: false },
   autoOpenActiveMenu: { type: Boolean, default: false },
   showNoContent: { type: Boolean, default: true },
-  noContentTemplate: { type: String, default: "" },
-  loadingTemplate: { type: String, default: "" },
-  innerListTemplate: { type: String, default: "" },
+  noContentTemplate: { type: Boolean, default: true },
+  loadingTemplate: { type: Boolean, default: true },
+  innerListTemplate: { type: Boolean, default: true },
   linkType: {
     type: String,
     default: ""
@@ -59,8 +62,43 @@ const accordionProps = {
     default: "normal"
   }
 };
+const OpenIcon = () => {
+  return createVNode("svg", {
+    "width": "1em",
+    "height": "1em",
+    "viewBox": "0 0 16 16",
+    "version": "1.1",
+    "xmlns": "http://www.w3.org/2000/svg",
+    "xmlns:xlink": "http://www.w3.org/1999/xlink"
+  }, [createVNode("g", {
+    "stroke": "none",
+    "stroke-width": "1",
+    "fill": "none",
+    "fill-rule": "evenodd"
+  }, [createVNode("path", {
+    "d": "M12.1464466,6.85355339 L8.35355339,10.6464466 C8.15829124,10.8417088 7.84170876,10.8417088 7.64644661,10.6464466 L3.85355339,6.85355339 C3.65829124,6.65829124 3.65829124,6.34170876 3.85355339,6.14644661 C3.94732158,6.05267842 4.07449854,6 4.20710678,6 L11.7928932,6 C12.0690356,6 12.2928932,6.22385763 12.2928932,6.5 C12.2928932,6.63260824 12.2402148,6.7597852 12.1464466,6.85355339 Z",
+    "fill-rule": "nonzero"
+  }, null)])]);
+};
+const getRootSlots = () => {
+  const rootComponentName = "DAccordion";
+  const getRootComponent = (component) => {
+    if (component && component.type.name === rootComponentName) {
+      return component;
+    }
+    if (component && component.parent) {
+      const parent = component.parent;
+      return getRootComponent(parent);
+    }
+  };
+  const rootComponent = getRootComponent(getCurrentInstance());
+  return rootComponent == null ? void 0 : rootComponent.slots;
+};
 var DAccordionMenu = defineComponent({
   name: "DAccordionMenu",
+  components: {
+    OpenIcon
+  },
   props: __spreadValues({
     item: Object,
     deepth: {
@@ -75,27 +113,167 @@ var DAccordionMenu = defineComponent({
   setup(props) {
     const {
       item,
-      deepth
+      deepth,
+      parent,
+      openKey,
+      activeKey,
+      autoOpenActiveMenu,
+      disabledKey,
+      childrenKey,
+      titleKey,
+      menuItemTemplate
     } = toRefs(props);
-    computed(() => {
-      return keyOpen === void 0 && props.autoOpenActiveMenu ? childActived : keyOpen;
-    });
+    const rootSlots = getRootSlots();
+    const accordionCtx = inject("accordionContext");
+    let parentValue = parent.value;
+    let deepValue = deepth.value;
+    const toggle = (itemEvent) => {
+      accordionCtx.menuToggleFn(itemEvent);
+    };
+    const hasActiveChildren = (item2) => {
+      if (item2[activeKey.value] === true)
+        return true;
+      if (item2[childrenKey.value]) {
+        return hasChildActive(item2[childrenKey.value]);
+      }
+    };
+    const hasChildActive = (arr) => {
+      let flag = false;
+      if (!arr.length)
+        return false;
+      for (let i = 0; i < arr.length; i++) {
+        if (arr[i][activeKey.value] === true) {
+          flag = true;
+          break;
+        }
+        if (arr[i][childrenKey.value]) {
+          flag = hasChildActive(arr[i][childrenKey.value]);
+          if (flag)
+            break;
+        }
+      }
+      return flag;
+    };
     const keyOpen = computed(() => {
-      return item == null ? void 0 : item.value[props.openKey];
+      return item.value && item.value[openKey.value];
+    });
+    const disabled = computed(() => {
+      return item.value && item.value[disabledKey.value];
+    });
+    const title = computed(() => {
+      return item.value && item.value[titleKey.value];
+    });
+    const children = computed(() => {
+      return item.value && item.value[childrenKey.value];
     });
     const childActived = computed(() => {
+      return hasActiveChildren(item.value);
+    });
+    const open = computed(() => {
+      return keyOpen.value === void 0 && autoOpenActiveMenu.value ? childActived.value : keyOpen.value;
     });
     return () => {
+      var _a;
       return createVNode(Fragment, null, [createVNode("div", {
-        "class": ["devui-accordion-item-title", "devui-over-flow-ellipsis", item.value.children ? "open active" : ""],
-        "title": item.value.title
-      }, [item.value.title]), createVNode(AccordionList, {
-        "class": "devui-accordion-submenu devui-accordion-show-animate",
-        "style": "opacity: 1; overflow: hidden;",
-        "deepth": deepth.value + 1,
-        "data": item.value.children || [],
+        "class": ["devui-accordion-item-title", "devui-over-flow-ellipsis", open.value && "open", childActived.value && "active", disabled.value && "disabled"],
+        "title": title.value,
+        "style": {
+          textIndent: deepValue * 20 + "px"
+        },
+        "onClick": (e) => !disabled.value && toggle({
+          item: item.value,
+          open: !open.value,
+          parent: parentValue,
+          event: e
+        })
+      }, [createVNode("div", {
+        "class": ["devui-accordion-splitter", deepValue === 0 && "devui-parent-list"],
+        "style": {
+          left: deepValue * 20 + 10 + "px"
+        }
+      }, null), (!rootSlots.menuItemTemplate || menuItemTemplate.value === false) && createVNode(Fragment, null, [title.value]), rootSlots.menuItemTemplate && menuItemTemplate.value !== false && ((_a = rootSlots.menuItemTemplate) == null ? void 0 : _a.call(rootSlots, {
+        parent: parentValue,
+        deepth: deepValue,
+        item: item.value
+      })), createVNode("span", {
+        "class": "devui-accordion-open-icon"
+      }, [createVNode(OpenIcon, null, null)])]), createVNode("div", {
+        "class": [!open.value && "devui-accordion-menu-hidden", "devui-accordion-submenu", "devui-accordion-show-animate"]
+      }, [createVNode(AccordionList, mergeProps(props, {
+        "deepth": deepValue + 1,
+        "data": children.value || [],
         "parent": item.value
-      }, null)]);
+      }), null)])]);
+    };
+  }
+});
+var DAccordionItem = defineComponent({
+  name: "DAccordionItem",
+  props: __spreadValues({
+    item: Object,
+    deepth: {
+      type: Number,
+      default: 0
+    },
+    parent: {
+      type: Object,
+      default: null
+    }
+  }, accordionProps),
+  setup(props) {
+    const {
+      item,
+      deepth,
+      parent,
+      titleKey,
+      activeKey,
+      disabledKey,
+      itemTemplate
+    } = toRefs(props);
+    const rootSlots = getRootSlots();
+    const accordionCtx = inject("accordionContext");
+    let parentValue = parent.value;
+    let deepValue = deepth.value;
+    const disabled = computed(() => {
+      return item.value && item.value[disabledKey.value];
+    });
+    const title = computed(() => {
+      return item.value && item.value[titleKey.value];
+    });
+    const active = computed(() => {
+      return item.value && item.value[activeKey.value];
+    });
+    const childActived = computed(() => {
+      return active.value;
+    });
+    const itemClick = (itemEvent) => {
+      if (item.value && !disabled.value) {
+        accordionCtx.itemClickFn(itemEvent);
+      }
+    };
+    return () => {
+      var _a;
+      return createVNode(Fragment, null, [createVNode("div", {
+        "class": ["devui-accordion-item-title", "devui-over-flow-ellipsis", childActived.value && "active", disabled.value && "disabled"],
+        "title": title.value,
+        "style": {
+          textIndent: deepValue * 20 + "px"
+        },
+        "onClick": (e) => itemClick({
+          item: item.value,
+          parent: parentValue,
+          event: e
+        })
+      }, [createVNode("div", {
+        "class": ["devui-accordion-splitter", deepValue === 0 && "devui-parent-list"],
+        "style": {
+          left: deepValue * 20 + 10 + "px"
+        }
+      }, null), (!rootSlots.itemTemplate || itemTemplate.value === false) && createVNode(Fragment, null, [title.value]), rootSlots.itemTemplate && itemTemplate.value !== false && ((_a = rootSlots.itemTemplate) == null ? void 0 : _a.call(rootSlots, {
+        parent: parentValue,
+        deepth: deepValue,
+        item: item.value
+      }))])]);
     };
   }
 });
@@ -103,7 +281,8 @@ var AccordionList = defineComponent({
   name: "DAccordionList",
   inheritAttrs: false,
   components: {
-    DAccordionMenu
+    DAccordionMenu,
+    DAccordionItem
   },
   props: __spreadValues({
     data: {
@@ -121,27 +300,84 @@ var AccordionList = defineComponent({
     innerListTemplate: Boolean
   }, accordionProps),
   setup(props, {
-    attrs,
-    slots
+    attrs
   }) {
     const {
       childrenKey,
-      innerListTemplate,
-      deepth
+      deepth,
+      parent,
+      data,
+      linkType,
+      showNoContent,
+      loadingKey,
+      titleKey,
+      loadingTemplate,
+      noContentTemplate,
+      innerListTemplate
     } = toRefs(props);
+    let parentValue = parent.value;
+    let deepValue = deepth.value;
+    const rootSlots = getRootSlots();
+    const accordionCtx = inject("accordionContext");
+    const loading = computed(() => {
+      return parentValue && parentValue[loadingKey.value];
+    });
+    const noContent = computed(() => {
+      let dataValue = data.value;
+      return dataValue === void 0 || dataValue === null || dataValue.length === 0;
+    });
     return () => {
-      return createVNode(Fragment, null, [!innerListTemplate.value && createVNode("ul", mergeProps({
-        "class": "devui-accordion-list"
-      }, attrs), [props.data.map((item) => {
+      var _a, _b, _c;
+      return createVNode(Fragment, null, [(!rootSlots.innerListTemplate || deepth.value === 0 || innerListTemplate.value === false) && createVNode("ul", mergeProps({
+        "class": ["devui-accordion-list"]
+      }, attrs), [data.value.map((item) => {
         return createVNode("li", {
           "class": "devui-accordion-item",
-          "key": item.title
-        }, [childrenKey !== void 0 && createVNode(resolveComponent("d-accordion-menu"), mergeProps({
+          "key": item[titleKey.value]
+        }, [item[childrenKey.value] !== void 0 && createVNode("div", {
+          "class": "devui-accordion-menu-item"
+        }, [createVNode(resolveComponent("d-accordion-menu"), mergeProps(props, {
           "item": item,
-          "deepth": props.deepth,
-          "parent": props.parent
-        }, accordionProps), null)]);
-      })]), innerListTemplate.value && deepth.value !== 0 && createVNode("div", null, [slots.default ? slots.innerListTemplate() : ""])]);
+          "deepth": deepValue,
+          "parent": parentValue
+        }), null)]), item[childrenKey.value] === void 0 && createVNode(Fragment, null, [(!linkType.value || linkType.value === "") && createVNode(resolveComponent("d-accordion-item"), mergeProps(props, {
+          "item": item,
+          "deepth": deepValue,
+          "parent": parentValue
+        }), null)])]);
+      })]), rootSlots.innerListTemplate && innerListTemplate.value !== false && deepValue !== 0 && ((_a = rootSlots.innerListTemplate) == null ? void 0 : _a.call(rootSlots, {
+        item: parentValue,
+        deepth: deepValue,
+        itemClickFn: accordionCtx.itemClickFn,
+        menuToggleFn: accordionCtx.menuToggleFn
+      })), (!rootSlots.innerListTemplate || innerListTemplate.value === false) && (loading.value || noContent.value && showNoContent.value) && createVNode("ul", mergeProps({
+        "class": ["devui-accordion-list"]
+      }, attrs), [
+        loading.value && (!rootSlots.loadingTemplate || loadingTemplate.value === false) && createVNode("li", {
+          "class": "devui-accordion-item"
+        }, [createVNode("div", {
+          "class": ["devui-accordion-item-title", "devui-over-flow-ellipsis"],
+          "style": {
+            textIndent: deepValue * 20 + "px"
+          }
+        }, [createTextVNode("\u52A0\u8F7D\u4E2D...")])]),
+        loading.value && rootSlots.loadingTemplate && loadingTemplate.value !== false && ((_b = rootSlots.loadingTemplate) == null ? void 0 : _b.call(rootSlots, {
+          item: parentValue,
+          deepth: deepValue
+        })),
+        showNoContent.value && !loading.value && noContent.value && (!rootSlots.noContentTemplate || noContentTemplate.value === false) && createVNode("li", {
+          "class": "devui-accordion-item"
+        }, [createVNode("div", {
+          "class": ["devui-accordion-item-title", "devui-over-flow-ellipsis disabled"],
+          "style": {
+            textIndent: deepValue * 20 + "px"
+          }
+        }, [createTextVNode("\u6CA1\u6709\u6570\u636E")])]),
+        showNoContent.value && !loading.value && noContent.value && rootSlots.noContentTemplate && noContentTemplate.value !== false && ((_c = rootSlots.noContentTemplate) == null ? void 0 : _c.call(rootSlots, {
+          item: parentValue,
+          deepth: deepValue
+        }))
+      ])]);
     };
   }
 });
@@ -198,28 +434,63 @@ var Accordion = defineComponent({
       clickActiveItem = item;
       emit("activeItemChange", clickActiveItem);
     };
+    const openMenuFn = (item, open) => {
+      if (open && restrictOneOpen.value) {
+        data.value.forEach((itemtemp) => {
+          itemtemp[openKey.value] = false;
+        });
+      }
+      item[openKey.value] = open;
+    };
+    const itemClickFn = (itemEvent) => {
+      const prevActiveItem = clickActiveItem;
+      activeItemFn(itemEvent.item);
+      emit("itemClick", __spreadProps(__spreadValues({}, itemEvent), {
+        prevActiveItem
+      }));
+    };
+    const linkItemClickFn = (itemEvent) => {
+      const prevActiveItem = clickActiveItem;
+      clickActiveItem = itemEvent.item;
+      emit("linkItemClick", __spreadProps(__spreadValues({}, itemEvent), {
+        prevActiveItem
+      }));
+    };
+    const menuToggleFn = (menuEvent) => {
+      openMenuFn(menuEvent.item, menuEvent.open);
+      emit("menuToggle", menuEvent);
+    };
     const cleanOpenData = () => {
       flatten(data.value, childrenKey.value, true, false).forEach((item) => item[openKey.value] = void 0);
     };
+    provide("accordionContext", {
+      itemClickFn,
+      linkItemClickFn,
+      menuToggleFn
+    });
     onMounted(() => {
       if (data.value) {
         initActiveItem();
       }
     });
     watch(() => autoOpenActiveMenu.value, (current, preV) => {
-      console.log("cur, new", current, preV);
       if (current && preV === false) {
         cleanOpenData();
       }
     });
+    watch(data.value, (current, preV) => {
+      initActiveItem();
+    }, {
+      deep: true
+    });
     return () => {
       return createVNode("div", {
-        "class": `devui-accordion-menu devui-scrollbar ${accordionType.value === "normal" ? "devui-accordion-menu-normal" : ""}`
-      }, [createVNode(AccordionList, mergeProps({
-        "data": data,
+        "class": ["devui-accordion-menu", "devui-scrollbar", "devui-accordion-show-animate", accordionType.value === "normal" && "devui-accordion-menu-normal"]
+      }, [createVNode(AccordionList, mergeProps(props, {
+        "data": data.value,
         "deepth": 0,
         "parent": null
-      }, props), null)]);
+      }), null)]);
     };
   }
 });