Browse Source

feat: use `@pureadmin/descriptions` replace `el-descriptions`

xiaoxian521 2 years ago
parent
commit
1b2eb2481e
5 changed files with 49 additions and 16 deletions
  1. 3 1
      package.json
  2. 21 7
      pnpm-lock.yaml
  3. 2 0
      src/main.ts
  4. 16 7
      src/views/result/success.vue
  5. 7 1
      tsconfig.json

+ 3 - 1
package.json

@@ -31,6 +31,7 @@
     "@logicflow/core": "^1.1.16",
     "@logicflow/extension": "^1.1.16",
     "@pureadmin/components": "^1.0.6",
+    "@pureadmin/descriptions": "^1.0.0",
     "@pureadmin/table": "^0.0.1",
     "@vueuse/core": "^8.7.4",
     "@vueuse/motion": "^2.0.0-beta.12",
@@ -68,7 +69,7 @@
     "vue-form-create2": "^1.2.8",
     "vue-i18n": "^9.2.0-beta.36",
     "vue-json-pretty": "^2.0.2",
-    "vue-pdf-embed": "^1.1.2",
+    "vue-pdf-embed": "^1.1.4",
     "vue-router": "^4.0.15",
     "vue-types": "^4.1.1",
     "vue-virtual-scroller": "^2.0.0-alpha.1",
@@ -109,6 +110,7 @@
     "@vitejs/plugin-vue-jsx": "^1.3.10",
     "@vue/eslint-config-prettier": "^7.0.0",
     "@vue/eslint-config-typescript": "^10.0.0",
+    "@vue/runtime-core": "^3.2.37",
     "autoprefixer": "^10.4.5",
     "cross-env": "7.0.3",
     "eslint": "^8.8.0",

+ 21 - 7
pnpm-lock.yaml

@@ -19,6 +19,7 @@ specifiers:
   "@logicflow/core": ^1.1.16
   "@logicflow/extension": ^1.1.16
   "@pureadmin/components": ^1.0.6
+  "@pureadmin/descriptions": ^1.0.0
   "@pureadmin/table": ^0.0.1
   "@pureadmin/theme": ^2.4.0
   "@types/element-resize-detector": 1.1.3
@@ -37,6 +38,7 @@ specifiers:
   "@vitejs/plugin-vue-jsx": ^1.3.10
   "@vue/eslint-config-prettier": ^7.0.0
   "@vue/eslint-config-typescript": ^10.0.0
+  "@vue/runtime-core": ^3.2.37
   "@vueuse/core": ^8.7.4
   "@vueuse/motion": ^2.0.0-beta.12
   "@vueuse/shared": ^8.7.4
@@ -106,7 +108,7 @@ specifiers:
   vue-form-create2: ^1.2.8
   vue-i18n: ^9.2.0-beta.36
   vue-json-pretty: ^2.0.2
-  vue-pdf-embed: ^1.1.2
+  vue-pdf-embed: ^1.1.4
   vue-router: ^4.0.15
   vue-types: ^4.1.1
   vue-virtual-scroller: ^2.0.0-alpha.1
@@ -122,6 +124,7 @@ dependencies:
   "@logicflow/core": 1.1.16
   "@logicflow/extension": 1.1.16
   "@pureadmin/components": 1.0.6_vue@3.2.37
+  "@pureadmin/descriptions": 1.0.0
   "@pureadmin/table": 0.0.1
   "@vueuse/core": 8.7.4_vue@3.2.37
   "@vueuse/motion": 2.0.0-beta.12_vue@3.2.37
@@ -159,7 +162,7 @@ dependencies:
   vue-form-create2: 1.2.9
   vue-i18n: 9.2.0-beta.36_vue@3.2.37
   vue-json-pretty: 2.0.6_vue@3.2.37
-  vue-pdf-embed: 1.1.2_vue@3.2.37
+  vue-pdf-embed: 1.1.4_vue@3.2.37
   vue-router: 4.0.15_vue@3.2.37
   vue-types: 4.1.1_vue@3.2.37
   vue-virtual-scroller: 2.0.0-alpha.1_vue@3.2.37
@@ -200,6 +203,7 @@ devDependencies:
   "@vitejs/plugin-vue-jsx": 1.3.10
   "@vue/eslint-config-prettier": 7.0.0_eslint@8.15.0+prettier@2.6.2
   "@vue/eslint-config-typescript": 10.0.0_7f105dc3ebd31cec885fdbbd30d5cc4c
+  "@vue/runtime-core": 3.2.37
   autoprefixer: 10.4.7_postcss@8.4.13
   cross-env: 7.0.3
   eslint: 8.15.0
@@ -1349,6 +1353,19 @@ packages:
       vue: 3.2.37
     dev: false
 
+  /@pureadmin/descriptions/1.0.0:
+    resolution:
+      {
+        integrity: sha512-fr+YLrxlmwiXTAVIKPqJbWQsRt3rqeUUz17d1BuH2Fzz8iSCd+hI4BoE1Z/bivzzoXVBC9wxBmWBSlN0n1YFAw==
+      }
+    dependencies:
+      "@element-plus/icons-vue": 2.0.6_vue@3.2.37
+      element-plus: 2.2.6_vue@3.2.37
+      vue: 3.2.37
+    transitivePeerDependencies:
+      - "@vue/composition-api"
+    dev: false
+
   /@pureadmin/table/0.0.1:
     resolution:
       {
@@ -2233,7 +2250,6 @@ packages:
       }
     dependencies:
       "@vue/shared": 3.2.37
-    dev: false
 
   /@vue/runtime-core/3.2.37:
     resolution:
@@ -2243,7 +2259,6 @@ packages:
     dependencies:
       "@vue/reactivity": 3.2.37
       "@vue/shared": 3.2.37
-    dev: false
 
   /@vue/runtime-dom/3.2.37:
     resolution:
@@ -2281,7 +2296,6 @@ packages:
       {
         integrity: sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw==
       }
-    dev: false
 
   /@vueuse/core/8.7.4_vue@3.2.37:
     resolution:
@@ -8703,10 +8717,10 @@ packages:
       vue: 3.2.37
     dev: false
 
-  /vue-pdf-embed/1.1.2_vue@3.2.37:
+  /vue-pdf-embed/1.1.4_vue@3.2.37:
     resolution:
       {
-        integrity: sha512-puXchZBqS3I/h+rPmqDYxMfE+UKtpOk2aRtGcl/BOgexNEPAggt1AghNOl8bmI/NY6M1+dS7YClQvWMvb9DJCA==
+        integrity: sha512-d4c7nM3LneWUiL4MssIyPHfGgVMRPh4Z7UgLsXMZ+lbAtH/6SBUFHdzZQLY2BASdh16BM/v6YCbmtQU+KIQdrg==
       }
     peerDependencies:
       vue: ^2.x || ^3.x

+ 2 - 0
src/main.ts

@@ -8,6 +8,7 @@ import { useI18n } from "../src/plugins/i18n";
 import { MotionPlugin } from "@vueuse/motion";
 import VirtualScroller from "vue-virtual-scroller";
 import { useTable } from "../src/plugins/vxe-table";
+import PureDescriptions from "@pureadmin/descriptions";
 import { injectResponsiveStorage } from "/@/utils/storage/responsive";
 
 import "uno.css";
@@ -52,6 +53,7 @@ getServerConfig(app).then(async config => {
     .use(MotionPlugin)
     .use(useI18n)
     .use(ElementPlus)
+    .use(PureDescriptions)
     .use(useTable)
     .use(VirtualScroller);
   app.mount("#app");

+ 16 - 7
src/views/result/success.vue

@@ -4,6 +4,21 @@ defineOptions({
 });
 
 const { lastBuildTime } = __APP_INFO__;
+
+const columns = [
+  {
+    label: "项目 ID:",
+    value: "12345"
+  },
+  {
+    label: "负责人:",
+    value: "明明"
+  },
+  {
+    label: "生效时间:",
+    value: lastBuildTime
+  }
+];
 </script>
 
 <template>
@@ -27,13 +42,7 @@ const { lastBuildTime } = __APP_INFO__;
       </template>
     </el-result>
     <div style="background: rgb(250, 250, 250)" class="p-6 ml-10 mr-10">
-      <el-descriptions title="项目名称" class="mb-5">
-        <el-descriptions-item label="项目 ID:">12345</el-descriptions-item>
-        <el-descriptions-item label="负责人:">明明</el-descriptions-item>
-        <el-descriptions-item label="生效时间:">{{
-          lastBuildTime
-        }}</el-descriptions-item>
-      </el-descriptions>
+      <PureDescriptions title="项目名称" :columns="columns" class="mb-5" />
       <el-steps :active="2">
         <el-step title="创建项目">
           <template #description>

+ 7 - 1
tsconfig.json

@@ -24,7 +24,13 @@
       "@build/*": ["build/*"],
       "/#/*": ["types/*"]
     },
-    "types": ["node", "vite/client", "element-plus/global", "unplugin-vue-define-options"],
+    "types": [
+      "node",
+      "vite/client",
+      "element-plus/global",
+      "unplugin-vue-define-options",
+      "@pureadmin/descriptions/volar"
+    ],
     "typeRoots": ["./node_modules/@types/", "./types"]
   },
   "include": [