1
0
Vben 4 жил өмнө
parent
commit
37f6660c57

+ 3 - 1
build/config/themeConfig.ts

@@ -2,6 +2,8 @@ import { generate } from '@ant-design/colors';
 
 export const primaryColor = '#0960bd';
 
+export const borderColorBase = '#d9d9d9';
+
 export const themeMode = 'light';
 
 export type ThemeMode = 'dark' | 'light';
@@ -97,7 +99,7 @@ export function generateModifyVars() {
     'text-color-secondary': 'rgba(0, 0, 0, 0.45)', // Subtext color
     'font-size-base': '14px', //  Main font size
     'box-shadow-base': '0 2px 8px rgba(0, 0, 0, 0.15)', //  Floating shadow
-    'border-color-base': '#d9d9d9', //  Border color,
+    'border-color-base': borderColorBase, //  Border color,
     'border-radius-base': '2px', //  Component/float fillet
     'link-color': primary, //   Link color
   };

+ 6 - 6
package.json

@@ -34,7 +34,7 @@
     "@iconify/iconify": "^2.0.0-rc.6",
     "@vueuse/core": "^4.6.2",
     "@zxcvbn-ts/core": "^0.3.0",
-    "ant-design-vue": "2.1.1",
+    "ant-design-vue": "^2.1.2",
     "apexcharts": "^3.26.0",
     "axios": "^0.21.1",
     "crypto-js": "^4.0.0",
@@ -47,7 +47,7 @@
     "qrcode": "^1.4.4",
     "sortablejs": "^1.13.0",
     "vditor": "^3.8.4",
-    "vue": "^3.0.9",
+    "vue": "3.0.7",
     "vue-i18n": "^9.0.0",
     "vue-router": "^4.0.5",
     "vue-types": "^3.0.2",
@@ -75,7 +75,7 @@
     "@vitejs/plugin-legacy": "^1.3.2",
     "@vitejs/plugin-vue": "^1.2.0",
     "@vitejs/plugin-vue-jsx": "^1.1.2",
-    "@vue/compiler-sfc": "^3.0.9",
+    "@vue/compiler-sfc": "3.0.7",
     "autoprefixer": "^10.2.5",
     "body-parser": "^1.19.0",
     "commitizen": "^4.2.3",
@@ -112,11 +112,11 @@
     "vite-plugin-imagemin": "^0.2.9",
     "vite-plugin-mock": "^2.4.0",
     "vite-plugin-purge-icons": "^0.7.0",
-    "vite-plugin-pwa": "^0.6.3",
-    "vite-plugin-style-import": "^0.9.0",
+    "vite-plugin-pwa": "^0.6.4",
+    "vite-plugin-style-import": "^0.9.1",
     "vite-plugin-svg-icons": "^0.4.0",
     "vite-plugin-theme": "^0.5.0",
-    "vite-plugin-windicss": "0.10.2",
+    "vite-plugin-windicss": "0.10.4",
     "vue-eslint-parser": "^7.6.0"
   },
   "resolutions": {

+ 18 - 6
src/components/Basic/src/BasicTitle.vue

@@ -1,5 +1,5 @@
 <template>
-  <span :class="[prefixCls, { 'show-span': span && $slots.default }]">
+  <span :class="getClass">
     <slot></slot>
     <BasicHelp :class="`${prefixCls}__help`" v-if="helpMessage" :text="helpMessage" />
   </span>
@@ -7,7 +7,7 @@
 <script lang="ts">
   import type { PropType } from 'vue';
 
-  import { defineComponent } from 'vue';
+  import { defineComponent, computed } from 'vue';
   import BasicHelp from './BasicHelp.vue';
 
   import { useDesign } from '/@/hooks/web/useDesign';
@@ -23,10 +23,17 @@
         default: '',
       },
       span: propTypes.bool,
+      normal: propTypes.bool.def(false),
     },
-    setup() {
+    setup(props, { slots }) {
       const { prefixCls } = useDesign('basic-title');
-      return { prefixCls };
+
+      const getClass = computed(() => [
+        prefixCls,
+        { [`${prefixCls}-show-span`]: props.span && slots.default },
+        { [`${prefixCls}-normal`]: props.normal },
+      ]);
+      return { prefixCls, getClass };
     },
   });
 </script>
@@ -38,13 +45,18 @@
     display: flex;
     padding-left: 7px;
     font-size: 16px;
-    font-weight: 700;
+    font-weight: 500;
     line-height: 24px;
     color: @text-color-base;
     cursor: pointer;
     user-select: none;
 
-    &.show-span::before {
+    &-normal {
+      font-size: 14px;
+      font-weight: normal;
+    }
+
+    &-show-span::before {
       position: absolute;
       top: 4px;
       left: 0;

+ 0 - 1
src/components/ClickOutSide/src/index.vue

@@ -5,7 +5,6 @@
 </template>
 <script lang="ts">
   import { defineComponent, ref, onMounted } from 'vue';
-
   import { onClickOutside } from '@vueuse/core';
   export default defineComponent({
     name: 'ClickOutSide',

+ 1 - 13
src/components/Container/src/LazyContainer.vue

@@ -1,6 +1,6 @@
 <template>
   <transition-group
-    :class="prefixCls"
+    class="h-full w-full"
     v-bind="$attrs"
     ref="elRef"
     :name="transitionName"
@@ -25,7 +25,6 @@
   import { useTimeoutFn } from '/@/hooks/core/useTimeout';
   import { useIntersectionObserver } from '/@/hooks/event/useIntersectionObserver';
   import { propTypes } from '/@/utils/propTypes';
-  import { useDesign } from '/@/hooks/web/useDesign';
 
   interface State {
     isInit: boolean;
@@ -72,8 +71,6 @@
         intersectionObserverInstance: null,
       });
 
-      const { prefixCls } = useDesign('lazy-container');
-
       onMounted(() => {
         immediateInit();
         initIntersectionObserver();
@@ -133,17 +130,8 @@
       }
       return {
         elRef,
-        prefixCls,
         ...toRefs(state),
       };
     },
   });
 </script>
-<style lang="less">
-  @prefix-cls: ~'@{namespace}-lazy-container';
-
-  .@{prefix-cls} {
-    width: 100%;
-    height: 100%;
-  }
-</style>

+ 15 - 6
src/components/Container/src/ScrollContainer.vue

@@ -12,18 +12,21 @@
 
   export default defineComponent({
     name: 'ScrollContainer',
-    // inheritAttrs: false,
     components: { Scrollbar },
     setup() {
       const scrollbarRef = ref<Nullable<ScrollbarType>>(null);
 
       function scrollTo(to: number, duration = 500) {
         const scrollbar = unref(scrollbarRef);
-        if (!scrollbar) return;
+        if (!scrollbar) {
+          return;
+        }
 
         nextTick(() => {
           const wrap = unref(scrollbar.wrap);
-          if (!wrap) return;
+          if (!wrap) {
+            return;
+          }
           const { start } = useScrollTo({
             el: wrap,
             to,
@@ -35,17 +38,23 @@
 
       function getScrollWrap() {
         const scrollbar = unref(scrollbarRef);
-        if (!scrollbar) return null;
+        if (!scrollbar) {
+          return null;
+        }
         return scrollbar.wrap;
       }
 
       function scrollBottom() {
         const scrollbar = unref(scrollbarRef);
-        if (!scrollbar) return;
+        if (!scrollbar) {
+          return;
+        }
 
         nextTick(() => {
           const wrap = unref(scrollbar.wrap);
-          if (!wrap) return;
+          if (!wrap) {
+            return;
+          }
           const scrollHeight = wrap.scrollHeight as number;
           const { start } = useScrollTo({
             el: wrap,

+ 12 - 20
src/components/Container/src/collapse/CollapseContainer.vue

@@ -1,29 +1,24 @@
 <template>
-  <div :class="['p-2', prefixCls]">
+  <div :class="prefixCls">
     <CollapseHeader
       v-bind="getBindValues"
       :prefixCls="prefixCls"
       :show="show"
       @expand="handleExpand"
-      :class="show ? 'mb-3' : ''"
     >
       <template #title>
         <slot name="title"></slot>
       </template>
     </CollapseHeader>
 
-    <CollapseTransition :enable="canExpan">
-      <Skeleton v-if="loading" />
-      <div :class="`${prefixCls}__body`" v-else v-show="show">
-        <LazyContainer :timeout="lazyTime" v-if="lazy">
+    <div class="p-2">
+      <CollapseTransition :enable="canExpan">
+        <Skeleton v-if="loading" :active="active" />
+        <div :class="`${prefixCls}__body`" v-else v-show="show">
           <slot></slot>
-          <template #skeleton>
-            <slot name="lazySkeleton"></slot>
-          </template>
-        </LazyContainer>
-        <slot v-else></slot>
-      </div>
-    </CollapseTransition>
+        </div>
+      </CollapseTransition>
+    </div>
   </div>
 </template>
 <script lang="ts">
@@ -33,9 +28,8 @@
 
   // component
   import { Skeleton } from 'ant-design-vue';
-  import { CollapseTransition } from '/@/components/Transition/index';
+  import { CollapseTransition } from '/@/components/Transition';
   import CollapseHeader from './CollapseHeader.vue';
-  import LazyContainer from '../LazyContainer.vue';
 
   import { triggerWindowResize } from '/@/utils/event';
   // hook
@@ -47,7 +41,6 @@
     name: 'CollapseContainer',
     components: {
       Skeleton,
-      LazyContainer,
       CollapseHeader,
       CollapseTransition,
     },
@@ -63,9 +56,8 @@
       // Whether to trigger window.resize when expanding and contracting,
       // Can adapt to tables and forms, when the form shrinks, the form triggers resize to adapt to the height
       triggerWindowResize: propTypes.bool,
-      loading: propTypes.bool,
-      // Delayed loading
-      lazy: propTypes.bool,
+      loading: propTypes.bool.def(false),
+      active: propTypes.bool.def(true),
       // Delayed loading time
       lazyTime: propTypes.number.def(0),
     },
@@ -109,9 +101,9 @@
     &__header {
       display: flex;
       height: 32px;
-      // margin-bottom: 10px;
       justify-content: space-between;
       align-items: center;
+      border-bottom: 1px solid @border-color-light;
     }
 
     &__action {

+ 2 - 2
src/components/Container/src/collapse/CollapseHeader.vue

@@ -1,6 +1,6 @@
 <template>
-  <div :class="[`${prefixCls}__header`, $attrs.class]">
-    <BasicTitle :helpMessage="helpMessage">
+  <div :class="[`${prefixCls}__header px-2 py-5`, $attrs.class]">
+    <BasicTitle :helpMessage="helpMessage" normal>
       <template v-if="title">
         {{ title }}
       </template>

+ 3 - 3
src/components/Scrollbar/src/index.vue

@@ -111,9 +111,9 @@
       onBeforeUnmount(() => {
         if (props.native) return;
         if (!props.noresize) {
-          removeResizeListener(unref(resize), update);
-          removeResizeListener(unref(wrap), update);
-          removeEventListener('resize', update);
+          //  removeResizeListener(unref(resize), update);
+          //  removeResizeListener(unref(wrap), update);
+          //  removeEventListener('resize', update);
         }
       });
 

+ 4 - 4
src/components/SimpleMenu/src/components/SubMenuItem.vue

@@ -9,11 +9,11 @@
           :class="`${prefixCls}-submenu-title-icon`"
         />
       </div>
-      <MenuCollapseTransition>
+      <CollapseTransition>
         <ul :class="prefixCls" v-show="opened">
           <slot></slot>
         </ul>
-      </MenuCollapseTransition>
+      </CollapseTransition>
     </template>
 
     <Popover
@@ -72,7 +72,7 @@
   import { propTypes } from '/@/utils/propTypes';
   import { useMenuItem } from './useMenu';
   import { useSimpleRootMenuContext } from './useSimpleMenuContext';
-  import MenuCollapseTransition from './MenuCollapseTransition.vue';
+  import { CollapseTransition } from '/@/components/Transition';
   import Icon from '/@/components/Icon';
   import { Popover } from 'ant-design-vue';
   import { isBoolean, isObject } from '/@/utils/is';
@@ -83,7 +83,7 @@
     name: 'SubMenu',
     components: {
       Icon,
-      MenuCollapseTransition,
+      CollapseTransition,
       Popover,
     },
     props: {

+ 4 - 4
src/components/SimpleMenu/src/components/menu.less

@@ -101,10 +101,10 @@
     list-style: none;
     outline: none;
 
-    .collapse-transition {
-      transition: @transition-time height ease-in-out, @transition-time padding-top ease-in-out,
-        @transition-time padding-bottom ease-in-out;
-    }
+    // .collapse-transition {
+    //   transition: @transition-time height ease-in-out, @transition-time padding-top ease-in-out,
+    //     @transition-time padding-bottom ease-in-out;
+    // }
 
     &-light {
       background: #fff;

+ 3 - 2
src/components/Table/src/BasicTable.vue

@@ -185,8 +185,10 @@
       } = useTableForm(getProps, slots, fetch);
 
       const getBindValues = computed(() => {
+        const dataSource = toRaw(unref(getDataSourceRef));
         let propsData: Recordable = {
           size: 'middle',
+          // ...(dataSource.length === 0 ? { getPopupContainer: () => document.body } : {}),
           ...attrs,
           customRow,
           expandIcon: expandIcon(),
@@ -199,7 +201,7 @@
           rowKey: unref(getRowKey),
           columns: toRaw(unref(getViewColumns)),
           pagination: toRaw(unref(getPaginationInfo)),
-          dataSource: toRaw(unref(getDataSourceRef)),
+          dataSource,
           footer: unref(getFooterProps),
           ...unref(getExpandOption),
         };
@@ -208,7 +210,6 @@
         }
 
         propsData = omit(propsData, 'class');
-
         return propsData;
       });
 

+ 5 - 10
src/components/Transition/index.ts

@@ -1,10 +1,8 @@
 import { createSimpleTransition, createJavascriptTransition } from './src/CreateTransition';
-import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
 
 import ExpandTransitionGenerator from './src/ExpandTransition';
 
-export { default as CollapseTransition } from './src/CollapseTransition';
-// export { default as CollapseTransition } from './src/CollapseTransition';
+export { default as CollapseTransition } from './src/CollapseTransition.vue';
 
 export const FadeTransition = createSimpleTransition('fade-transition');
 export const ScaleTransition = createSimpleTransition('scale-transition');
@@ -18,15 +16,12 @@ export const SlideXReverseTransition = createSimpleTransition('slide-x-reverse-t
 export const ScrollXReverseTransition = createSimpleTransition('scroll-x-reverse-transition');
 export const ScaleRotateTransition = createSimpleTransition('scale-rotate-transition');
 
-// Javascript transitions
-// export const ExpandTransition = createJavascriptTransition(
-//   'expand-transition',
-//   ExpandTransitionGenerator()
-// );
-
 export const ExpandXTransition = createJavascriptTransition(
   'expand-x-transition',
   ExpandTransitionGenerator('', true)
 );
 
-export const ExpandTransition = createAsyncComponent(() => import('./src/ExpandTransition.vue'));
+export const ExpandTransition = createJavascriptTransition(
+  'expand-transition',
+  ExpandTransitionGenerator('')
+);

+ 0 - 16
src/components/Transition/src/CollapseTransition.tsx

@@ -1,16 +0,0 @@
-// collapse 展开折叠
-import { defineComponent } from 'vue';
-import { getSlot } from '/@/utils/helper/tsxHelper';
-// import { createJavascriptTransition } from './CreateTransition';
-import ExpandTransition from './ExpandTransition.vue';
-
-// export const ExpandTransition = createJavascriptTransition(
-//   'expand-transition',
-//   ExpandTransitionGenerator()
-// );
-export default defineComponent({
-  name: 'CollapseTransition',
-  setup(_, { slots }) {
-    return () => <ExpandTransition>{() => getSlot(slots)}</ExpandTransition>;
-  },
-});

+ 9 - 18
src/components/Transition/src/ExpandTransition.vue → src/components/Transition/src/CollapseTransition.vue

@@ -1,17 +1,18 @@
 <template>
-  <transition v-on="on">
+  <transition mode="out-in" v-on="on">
     <slot></slot>
   </transition>
 </template>
 <script lang="ts">
-  import { addClass, removeClass } from '/@/utils/domUtils';
   import { defineComponent } from 'vue';
+  import { addClass, removeClass } from '/@/utils/domUtils';
+
   export default defineComponent({
     name: 'CollapseTransition',
     setup() {
       return {
         on: {
-          beforeEnter(el: any) {
+          beforeEnter(el) {
             addClass(el, 'collapse-transition');
             if (!el.dataset) el.dataset = {};
 
@@ -23,7 +24,7 @@
             el.style.paddingBottom = 0;
           },
 
-          enter(el: any) {
+          enter(el) {
             el.dataset.oldOverflow = el.style.overflow;
             if (el.scrollHeight !== 0) {
               el.style.height = el.scrollHeight + 'px';
@@ -38,14 +39,13 @@
             el.style.overflow = 'hidden';
           },
 
-          afterEnter(el: any) {
-            // for safari: remove class then reset height is necessary
+          afterEnter(el) {
             removeClass(el, 'collapse-transition');
             el.style.height = '';
             el.style.overflow = el.dataset.oldOverflow;
           },
 
-          beforeLeave(el: any) {
+          beforeLeave(el) {
             if (!el.dataset) el.dataset = {};
             el.dataset.oldPaddingTop = el.style.paddingTop;
             el.dataset.oldPaddingBottom = el.style.paddingBottom;
@@ -55,19 +55,16 @@
             el.style.overflow = 'hidden';
           },
 
-          leave(el: any) {
+          leave(el) {
             if (el.scrollHeight !== 0) {
-              // for safari: add class after set height, or it will jump to zero height suddenly, weired
               addClass(el, 'collapse-transition');
-              // in vue3.0.4, transitionProperty is set 'none' to avoid 'v-leave-from' issue
-              el.style.transitionProperty = 'height';
               el.style.height = 0;
               el.style.paddingTop = 0;
               el.style.paddingBottom = 0;
             }
           },
 
-          afterLeave(el: any) {
+          afterLeave(el) {
             removeClass(el, 'collapse-transition');
             el.style.height = '';
             el.style.overflow = el.dataset.oldOverflow;
@@ -79,9 +76,3 @@
     },
   });
 </script>
-<style lang="less" scoped>
-  .collapse-transition {
-    transition: 0.2s height ease-in-out, 0.2s padding-top ease-in-out,
-      0.2s padding-bottom ease-in-out;
-  }
-</style>

+ 4 - 0
src/design/transition/index.less

@@ -4,3 +4,7 @@
 @import './slide.less';
 @import './scroll.less';
 @import './zoom.less';
+
+.collapse-transition {
+  transition: 0.2s height ease-in-out, 0.2s padding-top ease-in-out, 0.2s padding-bottom ease-in-out;
+}

+ 1 - 1
src/views/demo/comp/transition/index.vue

@@ -32,7 +32,7 @@
     ScaleRotateTransition,
     ExpandXTransition,
     ExpandTransition,
-  } from '/@/components/Transition/index';
+  } from '/@/components/Transition';
 
   const transitionList = [
     'Fade',

+ 46 - 106
yarn.lock

@@ -297,11 +297,6 @@
   resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.13.11.tgz#f93ebfc99d21c1772afbbaa153f47e7ce2f50b88"
   integrity sha512-PhuoqeHoO9fc4ffMEVk4qb/w/s2iOSWohvbHxLtxui0eBg3Lg5gN1U8wp1V1u61hOWkPQJJyJzGH6Y+grwkq8Q==
 
-"@babel/parser@^7.13.9":
-  version "7.13.13"
-  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.13.13.tgz#42f03862f4aed50461e543270916b47dd501f0df"
-  integrity sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw==
-
 "@babel/plugin-proposal-async-generator-functions@^7.13.8":
   version "7.13.8"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz#87aacb574b3bc4b5603f6fe41458d72a5a2ec4b1"
@@ -1995,17 +1990,6 @@
     estree-walker "^2.0.1"
     source-map "^0.6.1"
 
-"@vue/compiler-core@3.0.9":
-  version "3.0.9"
-  resolved "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.9.tgz#ec7efa676889aee006fc43739ee4a67a952ac623"
-  integrity sha512-bHAPwfVoLhGx8d6KV/OfGf/3gwpymVirgfmSyhgv5YuXDybLa6BwjSLvhNMAyDP+4q4pp0p6g248LuoOy5W6OA==
-  dependencies:
-    "@babel/parser" "^7.12.0"
-    "@babel/types" "^7.12.0"
-    "@vue/shared" "3.0.9"
-    estree-walker "^2.0.1"
-    source-map "^0.6.1"
-
 "@vue/compiler-dom@3.0.7":
   version "3.0.7"
   resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.7.tgz#54d2e12fb9a7aff53abd19dac2c2679533f0c919"
@@ -2014,25 +1998,17 @@
     "@vue/compiler-core" "3.0.7"
     "@vue/shared" "3.0.7"
 
-"@vue/compiler-dom@3.0.9":
-  version "3.0.9"
-  resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.9.tgz#1fd554097d9ab36eca73bc6d0d9607fecf94e71c"
-  integrity sha512-tkq6umPSELaghvOExWfGNwrCRc7FTul3RLykKzBZWhb87sSESq0XxiKELfBOfEbzdhWg6BJ1WXKDeq+al/viEQ==
-  dependencies:
-    "@vue/compiler-core" "3.0.9"
-    "@vue/shared" "3.0.9"
-
-"@vue/compiler-sfc@^3.0.9":
-  version "3.0.9"
-  resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.9.tgz#0f993a6e159ca6ad351d8ee0c4734771d2590115"
-  integrity sha512-meneFRb9xIDgv/gYWCr9xKryvPi0tVffQzLjCkyN4RF1EndqLS71xugUX9wQsS4F1SAP+zlZbcgMFmTSC4OpHw==
+"@vue/compiler-sfc@3.0.7":
+  version "3.0.7"
+  resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.7.tgz#900414750cc726553b870490f48073451fd14f07"
+  integrity sha512-37/QILpGE+J3V+bP9Slg9e6xGqfk+MmS2Yj8ChR4fS0/qWUU/YoYHE0GPIzjmBdH0JVOOmJqunxowIXmqNiHng==
   dependencies:
-    "@babel/parser" "^7.13.9"
-    "@babel/types" "^7.13.0"
-    "@vue/compiler-core" "3.0.9"
-    "@vue/compiler-dom" "3.0.9"
-    "@vue/compiler-ssr" "3.0.9"
-    "@vue/shared" "3.0.9"
+    "@babel/parser" "^7.12.0"
+    "@babel/types" "^7.12.0"
+    "@vue/compiler-core" "3.0.7"
+    "@vue/compiler-dom" "3.0.7"
+    "@vue/compiler-ssr" "3.0.7"
+    "@vue/shared" "3.0.7"
     consolidate "^0.16.0"
     estree-walker "^2.0.1"
     hash-sum "^2.0.0"
@@ -2044,13 +2020,13 @@
     postcss-selector-parser "^6.0.4"
     source-map "^0.6.1"
 
-"@vue/compiler-ssr@3.0.9":
-  version "3.0.9"
-  resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.9.tgz#aebce25e573b9db34964b682bb1631a7240ba43d"
-  integrity sha512-99h5k6Up+s8AzTNH1ljtXE/QlnG8yaGLePwQ4XQaWfk23ESUnmGZWEC+y+ZXznf8pIfJ0uPeD9EVgQzQAyZ2aA==
+"@vue/compiler-ssr@3.0.7":
+  version "3.0.7"
+  resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.7.tgz#28b85d497381d75fe44234057b140b0065ca9dbf"
+  integrity sha512-nHRbHeSpfXwjypettjrA16TjgfDcPEwq3m/zHnGyLC1QqdLtklXmpSM43/CPwwTCRa/qdt0pldJf22MiCEuTSQ==
   dependencies:
-    "@vue/compiler-dom" "3.0.9"
-    "@vue/shared" "3.0.9"
+    "@vue/compiler-dom" "3.0.7"
+    "@vue/shared" "3.0.7"
 
 "@vue/devtools-api@^6.0.0-beta.5":
   version "6.0.0-beta.7"
@@ -2064,13 +2040,6 @@
   dependencies:
     "@vue/shared" "3.0.7"
 
-"@vue/reactivity@3.0.9":
-  version "3.0.9"
-  resolved "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.9.tgz#875f241b8c10262560b190ccdeff2d0ab7053e11"
-  integrity sha512-W1AbGhzphVjY+TL32lQDwLDNvLzZKOcUgaIaLOoALWMtjzN4ExOUJzrR1FC3ynlpMHIEfcUo8GPgfnNmvMGdgQ==
-  dependencies:
-    "@vue/shared" "3.0.9"
-
 "@vue/runtime-core@3.0.7":
   version "3.0.7"
   resolved "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.7.tgz#d44c0b0a57d7e392912a87362a4430ccf446ecea"
@@ -2079,14 +2048,6 @@
     "@vue/reactivity" "3.0.7"
     "@vue/shared" "3.0.7"
 
-"@vue/runtime-core@3.0.9":
-  version "3.0.9"
-  resolved "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.9.tgz#9665f149468355a524a304cb8f260147a4d294e6"
-  integrity sha512-j94xZ/wRZTVhqpoUgmxBTlojnPFu6TTXNw1Vw8oQkW1ZTGD0IwiJe3ycsKd1bpleXEMVt55GzGlCopI33/Gdmg==
-  dependencies:
-    "@vue/reactivity" "3.0.9"
-    "@vue/shared" "3.0.9"
-
 "@vue/runtime-dom@3.0.7":
   version "3.0.7"
   resolved "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.7.tgz#b70668d729020bc4ad608c20367223f259576ba6"
@@ -2096,25 +2057,11 @@
     "@vue/shared" "3.0.7"
     csstype "^2.6.8"
 
-"@vue/runtime-dom@3.0.9":
-  version "3.0.9"
-  resolved "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.9.tgz#16a1d001dc746a9f346ee7fb9de90d52ad097b61"
-  integrity sha512-6NCjpwa5hNBFDdokquAgMl2tNEYyQD6kBy9Mh6M2776bxYLXZCqL4/e0UrpBuBiHTrkAlUGODD7PyYGaqH6fyA==
-  dependencies:
-    "@vue/runtime-core" "3.0.9"
-    "@vue/shared" "3.0.9"
-    csstype "^2.6.8"
-
 "@vue/shared@3.0.7":
   version "3.0.7"
   resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.0.7.tgz#96d52988efc07444c108c7c6803ba7cc93e40045"
   integrity sha512-dn5FyfSc4ky424jH4FntiHno7Ss5yLkqKNmM/NXwANRnlkmqu74pnGetexDFVG5phMk9/FhwovUZCWGxsotVKg==
 
-"@vue/shared@3.0.9":
-  version "3.0.9"
-  resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.0.9.tgz#09882d745ded52b07e4481d036659d733edd2a9a"
-  integrity sha512-lv20q1O5dybwro+V+vnxHCmSIxi9mvTORSgAbGrANGYK8zF4K1S9TOankIvdkcvfZ88IR95O2pTI2Pb3c3BaNg==
-
 "@vueuse/core@^4.6.2":
   version "4.6.2"
   resolved "https://registry.npmjs.org/@vueuse/core/-/core-4.6.2.tgz#73a07ddbb3d01c66ef7d79500190f25a7ca7afac"
@@ -2130,16 +2077,18 @@
   dependencies:
     vue-demi latest
 
-"@windicss/plugin-utils@0.10.2":
-  version "0.10.2"
-  resolved "https://registry.npmjs.org/@windicss/plugin-utils/-/plugin-utils-0.10.2.tgz#d4a79c41f02c1704b54510a2bd2deaa43c905a7d"
-  integrity sha512-IeKaZEZ1Ww3KO5C3AxWLotMX3aGxhrj0MsTmiyMS1H5KXm6HOgfk+zsRiB0ysxGKrGZ4pMLe2H3Riku8o7YfuQ==
+"@windicss/plugin-utils@0.10.4":
+  version "0.10.4"
+  resolved "https://registry.npmjs.org/@windicss/plugin-utils/-/plugin-utils-0.10.4.tgz#ed9163b09e030f7358cc4742b1f2b6c92d084d5d"
+  integrity sha512-jQu69qzA56Lv18OK8U4mUTDV17st4EdPawQuaRG2VNK+ZEQWYsMNnqGxhzDTl/NhWTGCcTb3D6mlFPNo0QDOFg==
   dependencies:
     debug "^4.3.2"
     fast-glob "^3.2.5"
+    magic-string "^0.25.7"
     micromatch "^4.0.2"
+    pirates "^4.0.1"
     sucrase "^3.17.1"
-    windicss "^2.5.5"
+    windicss "^2.5.7"
 
 "@zxcvbn-ts/core@^0.3.0":
   version "0.3.0"
@@ -2284,10 +2233,10 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
-ant-design-vue@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-2.1.1.tgz#5c2f3d86177e197f6dbb167f691a9d10104e61c3"
-  integrity sha512-ohTEIBFRkODRTFXRHeizL/uKNOZY5+4r2y/GXiKEdvrxiTRgHgDNMWKsncG/+G6MXxOIe2Reg+r8jHS8nGDqtQ==
+ant-design-vue@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-2.1.2.tgz#2065d7e63199c0c584919458af57b6a0b597f677"
+  integrity sha512-gDG0wauGVt4LE63behrJaIcq4BB+dgs+dpj9jz17IgKr2MPYSEeKetU/x9Kk8d58cGonz4Ulncg7fBZJ7EljsQ==
   dependencies:
     "@ant-design-vue/use" "^0.0.1-0"
     "@ant-design/icons-vue" "^6.0.0"
@@ -10987,10 +10936,10 @@ vite-plugin-purge-icons@^0.7.0:
     "@purge-icons/generated" "^0.7.0"
     rollup-plugin-purge-icons "^0.7.0"
 
-vite-plugin-pwa@^0.6.3:
-  version "0.6.3"
-  resolved "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.6.3.tgz#91c0481e1c7f89b9c4502c582b2d25ea73aac311"
-  integrity sha512-wZxE2ZAKpwaig2JFOm6ama8p2iHBUZuHLEko1co7zDdnb6C/Epmih5aCIyHHvZKcFEaUxFogLQCnRDD41vd5cw==
+vite-plugin-pwa@^0.6.4:
+  version "0.6.4"
+  resolved "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.6.4.tgz#50294b67c545c689d9e234e266e042a68ddb9c56"
+  integrity sha512-YEKloivP8400uax8aqfYN2ygYjfok9xD/VgM9fyi1KVtP2JAgZKNPZnBc66HyaKPPDPr1TCeeXvB+aCSDSznqw==
   dependencies:
     debug "^4.3.2"
     fast-glob "^3.2.5"
@@ -10998,10 +10947,10 @@ vite-plugin-pwa@^0.6.3:
     workbox-build "^6.1.2"
     workbox-window "^6.1.2"
 
-vite-plugin-style-import@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.npmjs.org/vite-plugin-style-import/-/vite-plugin-style-import-0.9.0.tgz#4adc4456374ba0e87b7a178b59dce6f9fa7f6cd9"
-  integrity sha512-4Y8Px2t4IXnr6SqjPyAju3sELkV5UcwwoxkxsYkZOQRxHv2gtBUAsBuuQ8xTZNxbic4ODS+H/Z99UgtjNiDekw==
+vite-plugin-style-import@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.npmjs.org/vite-plugin-style-import/-/vite-plugin-style-import-0.9.1.tgz#259a0358c20628e9814cc6c4cf25f389b5761945"
+  integrity sha512-qQmeglG+3kYjHPq+XhyKOsXrKm1k3zLcEicTeFKcU+mbzhQA6lCaIn9EpBgAd7mSBF5HDiMNClCfpoSkShJMyw==
   dependencies:
     "@rollup/pluginutils" "^4.1.0"
     change-case "^4.1.2"
@@ -11051,15 +11000,15 @@ vite-plugin-theme@^0.5.0:
     tinycolor2 "^1.4.2"
     ts-jest "^26.5.3"
 
-vite-plugin-windicss@0.10.2:
-  version "0.10.2"
-  resolved "https://registry.npmjs.org/vite-plugin-windicss/-/vite-plugin-windicss-0.10.2.tgz#126edae552f2bec22273f5f533806e2b5d61c8ff"
-  integrity sha512-+kgzjwW6VNFlMlQvN4C5iCIqCAhSmTLteVz9IA7LjnpyM6X4tpZmWiTiNlLzAeiJt1eUpu9lFcA7GfuZR+OQDA==
+vite-plugin-windicss@0.10.4:
+  version "0.10.4"
+  resolved "https://registry.npmjs.org/vite-plugin-windicss/-/vite-plugin-windicss-0.10.4.tgz#e93577111ea0a55befbe4e2aa2e596f55f6b74b2"
+  integrity sha512-P7alH2dGGw3OTgjs9yZG2w0i+o1HKD8PChwhm2ftP+lLCe1xDL3LReheuRil9p2xPYzrVouER2YTbIdLUEThrQ==
   dependencies:
-    "@windicss/plugin-utils" "0.10.2"
+    "@windicss/plugin-utils" "0.10.4"
     chalk "^4.1.0"
     debug "^4.3.2"
-    windicss "^2.5.5"
+    windicss "^2.5.7"
 
 vite@2.1.3:
   version "2.1.3"
@@ -11111,7 +11060,7 @@ vue-types@^3.0.0, vue-types@^3.0.2:
   dependencies:
     is-plain-object "3.0.1"
 
-vue@^3.0.0:
+vue@3.0.7, vue@^3.0.0:
   version "3.0.7"
   resolved "https://registry.npmjs.org/vue/-/vue-3.0.7.tgz#8bcff51f8be570f9e4ce8cc5f52e2ab0fe3c74a1"
   integrity sha512-8h4TikD+JabbMK9aRlBO4laG0AtNHRPHynxYgWZ9sq1YUPfzynd9Jeeb27XNyZytC7aCQRX9xe1+TQJuc181Tw==
@@ -11120,15 +11069,6 @@ vue@^3.0.0:
     "@vue/runtime-dom" "3.0.7"
     "@vue/shared" "3.0.7"
 
-vue@^3.0.9:
-  version "3.0.9"
-  resolved "https://registry.npmjs.org/vue/-/vue-3.0.9.tgz#c68ffc0e4aa2b0f1905124a9037b6e352de469ad"
-  integrity sha512-MOvqDpvDslMWJo5kyGW1nTsTIPAuSzgVqmlzSQInIEqkHOu16pNbXuTjnG7jc/yIvQYFSQZqv6Pvad0iO5QkyQ==
-  dependencies:
-    "@vue/compiler-dom" "3.0.9"
-    "@vue/runtime-dom" "3.0.9"
-    "@vue/shared" "3.0.9"
-
 vuex-module-decorators@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/vuex-module-decorators/-/vuex-module-decorators-1.0.1.tgz#d34dafb5428a3636f1c26d3d014c15fc9659ccd0"
@@ -11242,10 +11182,10 @@ which@^2.0.1, which@^2.0.2:
   dependencies:
     isexe "^2.0.0"
 
-windicss@^2.5.5:
-  version "2.5.5"
-  resolved "https://registry.npmjs.org/windicss/-/windicss-2.5.5.tgz#691cc08e13dc9ee41293cd20cfdb6fed101e1d6a"
-  integrity sha512-tKLYY9qQoFKoxitG2B8toa9QUPAjsBOKjmFrxhDi2i0eaVOFQh+YEPElBCa7N5ma03YVIW9HPVbgVU0Z4JxZ5g==
+windicss@^2.5.7:
+  version "2.5.7"
+  resolved "https://registry.npmjs.org/windicss/-/windicss-2.5.7.tgz#aea36568cfb412e1c673468496e920f21ef06086"
+  integrity sha512-gsWZkotmw9Hr7yZy2nJAp46pmgMO1wXFFa3rfLWm57KDM31U/AucksQnwZi7zxsKM9c6O/z/61/Uvv4J096zKA==
 
 wmf@~1.0.1:
   version "1.0.2"