Преглед на файлове

chore: update element-plus@1.3.0-beta.1

xiaoxian521 преди 3 години
родител
ревизия
07794d000c

+ 3 - 4
package.json

@@ -45,7 +45,7 @@
     "dayjs": "^1.10.7",
     "driver.js": "^0.9.8",
     "echarts": "^5.2.1",
-    "element-plus": "1.2.0-beta.6",
+    "element-plus": "1.3.0-beta.1",
     "element-resize-detector": "^1.2.3",
     "font-awesome": "^4.7.0",
     "js-cookie": "^3.0.1",
@@ -67,10 +67,9 @@
     "vue-router": "^4.0.12",
     "vue-types": "^4.1.0",
     "vuedraggable": "4.1.0",
-    "vxe-table": "4.0.30",
+    "vxe-table": "^4.1.18",
     "wangeditor": "^4.7.9",
-    "xe-ajax": "4.0.5",
-    "xe-utils": "3.4.0",
+    "xe-utils": "^3.5.2",
     "xgplayer": "2.28.0"
   },
   "devDependencies": {

+ 21 - 29
pnpm-lock.yaml

@@ -38,7 +38,7 @@ specifiers:
   dayjs: ^1.10.7
   driver.js: ^0.9.8
   echarts: ^5.2.1
-  element-plus: 1.2.0-beta.6
+  element-plus: 1.3.0-beta.1
   element-resize-detector: ^1.2.3
   eslint: 7.30.0
   eslint-plugin-prettier: 3.4.0
@@ -83,10 +83,9 @@ specifiers:
   vue-router: ^4.0.12
   vue-types: ^4.1.0
   vuedraggable: 4.1.0
-  vxe-table: 4.0.30
+  vxe-table: ^4.1.18
   wangeditor: ^4.7.9
-  xe-ajax: 4.0.5
-  xe-utils: 3.4.0
+  xe-utils: ^3.5.2
   xgplayer: 2.28.0
 
 dependencies:
@@ -107,7 +106,7 @@ dependencies:
   dayjs: 1.10.7
   driver.js: 0.9.8
   echarts: 5.2.2
-  element-plus: 1.2.0-beta.6_vue@3.2.24
+  element-plus: 1.3.0-beta.1_vue@3.2.24
   element-resize-detector: 1.2.3
   font-awesome: 4.7.0
   js-cookie: 3.0.1
@@ -129,10 +128,9 @@ dependencies:
   vue-router: 4.0.12_vue@3.2.24
   vue-types: 4.1.1_vue@3.2.24
   vuedraggable: 4.1.0_vue@3.2.24
-  vxe-table: 4.0.30_vue@3.2.24+xe-utils@3.4.0
+  vxe-table: 4.1.18_vue@3.2.24+xe-utils@3.5.2
   wangeditor: 4.7.9
-  xe-ajax: 4.0.5
-  xe-utils: 3.4.0
+  xe-utils: 3.5.2
   xgplayer: 2.28.0
 
 devDependencies:
@@ -1598,10 +1596,10 @@ packages:
       vue-demi: 0.12.1_vue@3.2.24
     dev: false
 
-  /@vueuse/core/7.4.0_vue@3.2.24:
+  /@vueuse/core/7.4.3_vue@3.2.24:
     resolution:
       {
-        integrity: sha512-CgYouxjXOE63gMn3l9cOsgzPTEAk3yoncsSmJUxXAi/to25rCPVWB/39jXTPhWZboR43EDDMWoEhHaSoMzaldg==
+        integrity: sha512-OflPLlQ7eqaDJgKYw9DpRCbtfpkFkg1EqHFq7CFrbIEElB39wIfB9ccNypCar8e5KRDrAbOJLIOOvDZO6aC2Gg==
       }
     peerDependencies:
       "@vue/composition-api": ^1.1.0
@@ -1612,7 +1610,7 @@ packages:
       vue:
         optional: true
     dependencies:
-      "@vueuse/shared": 7.4.0_vue@3.2.24
+      "@vueuse/shared": 7.4.3_vue@3.2.24
       vue: 3.2.24
       vue-demi: 0.12.1_vue@3.2.24
     dev: false
@@ -1653,10 +1651,10 @@ packages:
       vue-demi: 0.12.1_vue@3.2.24
     dev: false
 
-  /@vueuse/shared/7.4.0_vue@3.2.24:
+  /@vueuse/shared/7.4.3_vue@3.2.24:
     resolution:
       {
-        integrity: sha512-x5Jn6jUB8gS1mGnVCoNWFEpAoDkm2QwtacZTUgKMn0Ow8tlUBKIfGVOt4vn9qZB10froED/ARHEj79WKLXRieA==
+        integrity: sha512-tNOCbpD3uZyzxNuw2GX5LTVkMB//IZ7GS452F7TwlY07aIoGjPgixi2Yfk/xSR4CcC9iU56zprZW33aEGj1O1Q==
       }
     peerDependencies:
       "@vue/composition-api": ^1.1.0
@@ -2990,17 +2988,18 @@ packages:
       }
     dev: true
 
-  /element-plus/1.2.0-beta.6_vue@3.2.24:
+  /element-plus/1.3.0-beta.1_vue@3.2.24:
     resolution:
       {
-        integrity: sha512-8EdSIR/5/FHcSB8w1diAh+gJMHgxIvxuZoayY99k6taAR1QyEFHuPTgFccZLopJ1+iP4UEsZFz49l57qS08Utw==
+        integrity: sha512-q3vMaKElPpuSTeIF7kuDmMOE+N1YVCCIG3fshXpz6qgjnxPbgZumVM0qGfhr8DTu9JxRbBoDok49dqtX/BWn3w==
       }
     peerDependencies:
       vue: ^3.2.0
     dependencies:
+      "@ctrl/tinycolor": 3.4.0
       "@element-plus/icons-vue": 0.2.4_vue@3.2.24
       "@popperjs/core": 2.11.0
-      "@vueuse/core": 7.4.0_vue@3.2.24
+      "@vueuse/core": 7.4.3_vue@3.2.24
       async-validator: 4.0.7
       dayjs: 1.10.7
       lodash: 4.17.21
@@ -7608,17 +7607,17 @@ packages:
       vue: 3.2.24
     dev: false
 
-  /vxe-table/4.0.30_vue@3.2.24+xe-utils@3.4.0:
+  /vxe-table/4.1.18_vue@3.2.24+xe-utils@3.5.2:
     resolution:
       {
-        integrity: sha512-sHUJL+XazADSTJlAZDwIAVeOMB3hBSj+5IeAUKHH+eKmSYju+l31og7NbgYsgRVTpG959F9EpUOnMMXvWptq/w==
+        integrity: sha512-hiaJv45rl8swU8YrtZVM7UhVMCrlkhxnZKuyjM1zcFhSNhuQWIy7KkewZctk83foAxlTBjEzwGNsXDuWjBW3vQ==
       }
     peerDependencies:
       vue: ^3.2.2
-      xe-utils: ^3.2.0
+      xe-utils: ^3.5.0
     dependencies:
       vue: 3.2.24
-      xe-utils: 3.4.0
+      xe-utils: 3.5.2
     dev: false
 
   /wangeditor/4.7.9:
@@ -7708,17 +7707,10 @@ packages:
       typedarray-to-buffer: 3.1.5
     dev: true
 
-  /xe-ajax/4.0.5:
+  /xe-utils/3.5.2:
     resolution:
       {
-        integrity: sha512-SlVaSfOyBH2Dy51zevNbTIY1EcRlIjoP25YXcN+l9gYfl1rsQ68EsVPD6gw47sM/zzQhiPvqmzM4RzOUggbgaw==
-      }
-    dev: false
-
-  /xe-utils/3.4.0:
-    resolution:
-      {
-        integrity: sha512-V2o/Ew/iXBduWbj0ixqA7atUe4HFxo0HcpBsxnrLHbKVspfZ2O/7+m325AHcN2xxPZtBZGQVg1w/cQ5Q8WmcTA==
+        integrity: sha512-TIQct9Ed43O5J0YYRMmD15KHKUzGIW+Hetv9/diEMHT5YQVr0csC0FCFOfSgsIcuamziPVAWNFLl1QKYJE2oxA==
       }
     dev: false
 

+ 5 - 23
src/components/ReCharts/src/Github.vue

@@ -10,13 +10,7 @@ const lists = ref([
 </script>
 
 <template>
-  <el-descriptions
-    class="margin-top"
-    direction="vertical"
-    :column="3"
-    size="medium"
-    border
-  >
+  <el-descriptions class="margin-top" direction="vertical" :column="3" border>
     <el-descriptions-item>
       <template #label>
         <el-icon><user /></el-icon>
@@ -39,13 +33,7 @@ const lists = ref([
       上海
     </el-descriptions-item>
   </el-descriptions>
-  <el-descriptions
-    class="margin-top"
-    direction="vertical"
-    :column="2"
-    size="medium"
-    border
-  >
+  <el-descriptions class="margin-top" direction="vertical" :column="2" border>
     <el-descriptions-item>
       <template #label>
         <el-icon><tickets /></el-icon>
@@ -55,7 +43,7 @@ const lists = ref([
         v-for="item in lists"
         :key="item.label"
         :type="item.type"
-        size="mini"
+        size="small"
         effect="dark"
       >
         {{ item.label }}
@@ -69,13 +57,7 @@ const lists = ref([
       上海市徐汇区
     </el-descriptions-item>
   </el-descriptions>
-  <el-descriptions
-    class="margin-top"
-    direction="vertical"
-    :column="1"
-    size="medium"
-    border
-  >
+  <el-descriptions class="margin-top" direction="vertical" :column="1" border>
     <el-descriptions-item>
       <template #label>
         <el-icon><notebook /></el-icon>
@@ -87,7 +69,7 @@ const lists = ref([
 </template>
 
 <style scoped>
-.el-tag--mini {
+.el-tag {
   margin-right: 10px !important;
 }
 </style>

+ 1 - 4
src/layout/components/navbar.vue

@@ -234,7 +234,7 @@ function translationEn() {
 
 .translation {
   .el-dropdown-menu__item {
-    padding: 0 40px !important;
+    padding: 5px 40px !important;
   }
 
   .el-dropdown-menu__item:focus,
@@ -246,12 +246,10 @@ function translationEn() {
   .check-zh {
     position: absolute;
     left: 20px;
-    top: 13px;
   }
 
   .check-en {
     position: absolute;
-    bottom: 13px;
     left: 20px;
   }
 }
@@ -263,7 +261,6 @@ function translationEn() {
     min-width: 100%;
     display: inline-flex;
     flex-wrap: wrap;
-    padding: 0 18px !important;
   }
 
   .el-dropdown-menu__item:focus,

+ 1 - 4
src/layout/components/sidebar/horizontal.vue

@@ -203,7 +203,7 @@ onMounted(() => {
 <style lang="scss" scoped>
 .translation {
   .el-dropdown-menu__item {
-    padding: 0 40px !important;
+    padding: 5px 40px !important;
   }
 
   .el-dropdown-menu__item:focus,
@@ -215,12 +215,10 @@ onMounted(() => {
   .check-zh {
     position: absolute;
     left: 20px;
-    top: 13px;
   }
 
   .check-en {
     position: absolute;
-    bottom: 13px;
     left: 20px;
   }
 }
@@ -232,7 +230,6 @@ onMounted(() => {
     min-width: 100%;
     display: inline-flex;
     flex-wrap: wrap;
-    padding: 0 18px !important;
   }
 
   .el-dropdown-menu__item:focus,

+ 0 - 1
src/layout/components/tag/index.scss

@@ -207,7 +207,6 @@
   li {
     width: 100%;
     margin: 0;
-    padding: 0 12px;
     cursor: pointer;
     display: flex;
     align-items: center;

+ 1 - 3
src/views/guide/index.vue

@@ -73,9 +73,7 @@ const guide = () => {
 
 <template>
   <div>
-    <div style="font-size: 18px">
-      引导页对于一些第一次进入项目的人很有用,你可以简单介绍下项目的功能
-    </div>
+    <p>引导页对于一些第一次进入项目的人很有用,你可以简单介绍下项目的功能</p>
     <el-button
       type="primary"
       style="margin-top: 10px"

+ 1 - 6
src/views/tabs/index/index.vue

@@ -30,12 +30,7 @@ function toDetail(index: number) {
       title="标签页复用超出限制自动关闭(使用场景: 动态路由)"
       name="tag"
     >
-      <el-button
-        v-for="index in 6"
-        :key="index"
-        size="medium"
-        @click="toDetail(index)"
-      >
+      <el-button v-for="index in 6" :key="index" @click="toDetail(index)">
         打开{{ index }}详情页
       </el-button>
     </el-collapse-item>

+ 13 - 15
src/views/welcome.vue

@@ -63,9 +63,7 @@ const openDepot = (): void => {
       >
         <el-card>
           <template #header>
-            <div>
-              <span>GitHub信息</span>
-            </div>
+            <span style="font-size: 16px; font-weight: 500">GitHub信息</span>
           </template>
           <el-skeleton animated :rows="7" :loading="loading">
             <template #default>
@@ -97,9 +95,9 @@ const openDepot = (): void => {
       >
         <el-card>
           <template #header>
-            <div>
-              <span>GitHub滚动信息</span>
-            </div>
+            <span style="font-size: 16px; font-weight: 500"
+              >GitHub滚动信息</span
+            >
           </template>
           <el-skeleton animated :rows="7" :loading="loading">
             <template #default>
@@ -131,9 +129,9 @@ const openDepot = (): void => {
       >
         <el-card>
           <template #header>
-            <div>
-              <span>GitHub饼图信息</span>
-            </div>
+            <span style="font-size: 16px; font-weight: 500"
+              >GitHub饼图信息</span
+            >
           </template>
           <el-skeleton animated :rows="7" :loading="loading">
             <template #default>
@@ -165,9 +163,9 @@ const openDepot = (): void => {
       >
         <el-card>
           <template #header>
-            <div>
-              <span>GitHub折线图信息</span>
-            </div>
+            <span style="font-size: 16px; font-weight: 500"
+              >GitHub折线图信息</span
+            >
           </template>
           <el-skeleton animated :rows="7" :loading="loading">
             <template #default>
@@ -199,9 +197,9 @@ const openDepot = (): void => {
       >
         <el-card>
           <template #header>
-            <div>
-              <span>GitHub柱状图信息</span>
-            </div>
+            <span style="font-size: 16px; font-weight: 500"
+              >GitHub柱状图信息</span
+            >
           </template>
           <el-skeleton animated :rows="7" :loading="loading">
             <template #default>