release v1.5.0 (#1523)

* feat: release v1.4.0

* fix(search): fix props max-length

* test(search): improve test case

* refactor: Refactor code and component structure

* fix: fix file name error

* test(icon): improve icon test case

* fix(tabs): fix content of tab has not changed when add a tab

* refactor(popover): refactor popover test

* test(form-item): add form-item test

* fix(modal): 修复弹窗组件信息提示图标的颜色

* chore: release v1.4.1

* fix(collapse): 修复折叠面板禁用时图标颜色

* fix(time-picker): fix test case not pass

* test(textarea、dropdown): improve test case

* feat: documents support importing vue files

* chore: solve eslint error

* chore: update version to 1.5.0

* fix: fix build failed: ERR_REQUIRE_ESM

Co-authored-by: hxj9102 <[email protected]>
Co-authored-by: chenxi24 <[email protected]>
Co-authored-by: Zz-ZzzZ <[email protected]>
Co-authored-by: huangxiaojie02 <[email protected]>
Co-authored-by: 刘元博 <[email protected]>
Co-authored-by: gxuud <[email protected]>

Author: 7 people

.eslintrc.js

@@ -1,6 +1,6 @@
 module.exports = {
   root: true,
-  parser: '@typescript-eslint/parser',
+  parser: 'vue-eslint-parser',
   parserOptions: {
     sourceType: 'module',
     ecmaVersion: 6,
@@ -110,4 +110,13 @@ module.exports = {
     '@typescript-eslint/member-ordering': 'off',
     'array-callback-return': 'off',
   },
+  "overrides": [
+    {
+      "files": [
+        "*.ts",
+        "*.tsx"
+      ],
+      "parser": "@typescript-eslint/parser"
+    }
+  ]
 };

package.json

@@ -14,6 +14,7 @@
     "@commitlint/cli": "^11.0.0",
     "@ls-lint/ls-lint": "^1.10.0",
     "@types/lodash": "^4.14.182",
+    "@types/node": "^16.11.6",
     "all-contributors-cli": "^6.20.0",
     "better-scripts": "^0.1.1",
     "esbuild-register": "^2.6.0",

packages/devui-vue/devui/collapse/src/collapse.scss

@@ -33,6 +33,10 @@
   &.#{$devui-prefix}-collapse__item--disabled {
     color: $devui-disabled-text;
     cursor: not-allowed;
+
+    & > .#{$devui-prefix}-collapse__open-icon svg path {
+      fill: currentColor !important;
+    }
   }
 
   &:not(.#{$devui-prefix}-collapse__item--disabled) {

packages/devui-vue/devui/dropdown/__tests__/dropdown.spec.tsx

@@ -1,12 +1,20 @@
 import { mount } from '@vue/test-utils';
 import { nextTick, ref } from 'vue';
-import Dropdown from '../src/dropdown';
+import { Dropdown, DropdownMenu } from '../';
 import { useNamespace } from '../../shared/hooks/use-namespace';
 
 const buttonClass = useNamespace('button', true).b();
 const flexibleOverlayClass = useNamespace('flexible-overlay', true).b();
+const dropdownNs = useNamespace('dropdown', true);
 
 describe('d-dropdown', () => {
+  beforeEach(() => {
+    const dropdownMenus = document.querySelectorAll(flexibleOverlayClass);
+    [...dropdownMenus].forEach(dropdownMenu => {
+      dropdownMenu && dropdownMenu.parentNode?.removeChild(dropdownMenu);
+    });
+  });
+
   it('should render correctly', async () => {
     const wrapper = mount({
       setup() {
@@ -180,7 +188,64 @@ describe('d-dropdown', () => {
     wrapper.unmount();
   });
 
-  it.todo('multi dropdown should work well.');
+  it('multi dropdown should work well.', async () => {
+    const wrapper = mount({
+      setup() {
+        return () => (
+          <Dropdown>
+            {{
+              default: () => <d-button>Click Me</d-button>,
+              menu: () => (
+                <ul class="list-menu">
+                  <li class="menu-item">Item 1</li>
+                  <Dropdown>
+                    {{
+                      default: () => <li class="menu-item">Item 2</li>,
+                      menu: () => (
+                        <ul class="sub-list-menu">
+                          <li class="sub-menu-item">Item 2-1</li>
+                          <li class="sub-menu-item">Item 2-2</li>
+                          <li class="sub-menu-item">Item 2-3</li>
+                        </ul>
+                      ),
+                    }}
+                  </Dropdown>
+                </ul>
+              ),
+            }}
+          </Dropdown>
+        );
+      },
+    });
+    await nextTick();
+    const btn = wrapper.find(buttonClass);
+    await btn.trigger('click');
+    expect(document.querySelectorAll(dropdownNs.e('menu-wrap')).length).toBe(1);
+    await document.querySelector(dropdownNs.e('menu-wrap'))?.querySelectorAll('.menu-item')[1]?.click();
+    expect(document.querySelectorAll(dropdownNs.e('menu-wrap')).length).toBe(2);
+    wrapper.unmount();
+  });
 
-  it.todo('d-dropdown-item should work well.');
+  it('d-dropdown-item should work well.', async () => {
+    const isOpen = ref(false);
+    const wrapper = mount({
+      setup () {
+        return () => (
+          <DropdownMenu v-model={isOpen.value}>
+            <ul class="list-menu">
+              <li class="menu-item">Item 1</li>
+              <li class="menu-item">Item 2</li>
+              <li class="menu-item">Item 3</li>
+              <li class="menu-item">Item 4</li>
+            </ul>
+          </DropdownMenu>
+        );
+      },
+    });
+    expect(document.querySelector(dropdownNs.e('menu-wrap'))).toBeFalsy();
+    isOpen.value = true;
+    await nextTick();
+    expect(document.querySelector(dropdownNs.e('menu-wrap'))).toBeTruthy();
+    wrapper.unmount();
+  });
 });

packages/devui-vue/devui/editable-select/src/components/dropdown/dropdown.tsx

@@ -4,7 +4,7 @@ import { EditableSelectContext, Option as O, SELECT_KEY } from '../../editable-s
 import Option from '../option/option';
 import Loading from '../../../../loading/src/loading-directive';
 import { useNamespace } from '../../../../shared/hooks/use-namespace';
-import { debounce } from 'lodash-es';
+import { debounce } from 'lodash';
 
 export default defineComponent({
   name: 'DEditableSelectDropdown',

packages/devui-vue/devui/editable-select/src/composables/use-input-event.ts

@@ -1,5 +1,5 @@
 import { computed, Ref, SetupContext } from 'vue';
-import { debounce, isFunction } from 'lodash-es';
+import { debounce, isFunction } from 'lodash';
 import { EditableSelectProps } from '../editable-select-types';
 import { States } from './use-select';
 

packages/devui-vue/devui/editable-select/src/composables/use-select.ts

@@ -1,7 +1,7 @@
 import { computed, ComputedRef, getCurrentInstance, nextTick, onMounted, reactive, ref, Ref, SetupContext, watch } from 'vue';
 import { EditableSelectProps, Option, Options } from '../editable-select-types';
 import { createI18nTranslate } from '../../../locale/create';
-import { isNil } from 'lodash-es';
+import { isNil } from 'lodash';
 
 export interface UseSelectStatesReturnType {
   hoveringIndex: number;

packages/devui-vue/devui/textarea/__tests__/textarea.spec.ts

@@ -1,6 +1,9 @@
 import { mount } from '@vue/test-utils';
 import { ref, nextTick } from 'vue';
 import DTextarea from '../src/textarea';
+import { useNamespace } from '../../shared/hooks/use-namespace';
+
+const ns = useNamespace('textarea', true);
 
 describe('textarea test', () => {
   it('d-textarea render work', async () => {
@@ -128,5 +131,26 @@ describe('textarea test', () => {
 
   it.todo('props resize work well.');
 
-  it.todo('props show-count work well.');
+  it('props show-count work well.', async () => {
+    const value = ref('');
+    const wrapper = mount({
+      components: { DTextarea },
+      template: `
+        <d-textarea v-model="value" show-count />
+      `,
+      setup () {
+        return {
+          value,
+        };
+      },
+    });
+    expect(wrapper.find(ns.e('show-count')).text()).toBe('0');
+    value.value = '12345678';
+    await nextTick();
+    expect(wrapper.find(ns.e('show-count')).text()).toBe('8');
+    await wrapper.setProps({
+      maxlength: 20,
+    });
+    expect(wrapper.find(ns.e('show-count')).text()).toBe('8 / 20');
+  });
 });

packages/devui-vue/devui/time-picker/__tests__/time-picker.spec.ts

@@ -172,9 +172,9 @@ describe('time-picker test', () => {
       };
       slotDemo.value.chooseTime(timeObj);
     };
+    let date = new Date();
     // 插槽内方法  --  选择当前时间
     const chooseNowFun = () => {
-      const date = new Date();
       const hour = date.getHours() > 9 ? date.getHours() : '0' + date.getHours();
       const minute = date.getMinutes() > 9 ? date.getMinutes() : '0' + date.getMinutes();
       const second = date.getSeconds() > 9 ? date.getSeconds() : '0' + date.getSeconds();
@@ -210,6 +210,7 @@ describe('time-picker test', () => {
     await timeInput.trigger('focus');
     const slotBottomNow = document.querySelector('.slot-bottom-now');
     const slotBottomOne = document.querySelector('.slot-bottom-one');
+    date = new Date();
     await slotBottomNow?.dispatchEvent(new Event('click'));
     expect(timeInput.element.value).toBe(chooseNowFun());
 

packages/devui-vue/docs/.vitepress/config/markdown.ts

@@ -1,9 +1,14 @@
+const options = { cssPreprocessor: 'scss' };
+import { blockPlugin } from '../plugins/block-plugin';
+import { renderPlugin, codePlugin } from 'vitepress-theme-demoblock';
+
 const markdown = {
   config: (md) => {
-    const { demoBlockPlugin } = require('vitepress-theme-demoblock')
-    md.use(demoBlockPlugin, {
-      cssPreprocessor: 'scss'
-    })
+    md.use((curMd) => {
+      curMd.use(blockPlugin, options);
+      curMd.use(codePlugin, options);
+      curMd.use(renderPlugin, options);
+    });
   }
 }
-export default markdown
+export default markdown;