From 91576bd7ddca1a8d83d460325160323f1970d356 Mon Sep 17 00:00:00 2001 From: xiaoxian521 <1923740402@qq.com> Date: Fri, 24 Jun 2022 14:12:56 +0800 Subject: [PATCH] chore: update `@pureadmin/descriptions` --- package.json | 2 +- pnpm-lock.yaml | 8 +- src/views/about/columns.tsx | 67 ++++++++++++++ src/views/about/index.vue | 45 ++-------- src/views/result/columns.tsx | 66 ++++++++++++++ src/views/result/fail.vue | 58 ++---------- src/views/welcome/components/Github.vue | 108 ++++++----------------- src/views/welcome/components/columns.tsx | 100 +++++++++++++++++++++ 8 files changed, 276 insertions(+), 178 deletions(-) create mode 100644 src/views/about/columns.tsx create mode 100644 src/views/result/columns.tsx create mode 100644 src/views/welcome/components/columns.tsx diff --git a/package.json b/package.json index 417e7dacd..591e2f832 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "@logicflow/core": "^1.1.16", "@logicflow/extension": "^1.1.16", "@pureadmin/components": "^1.0.6", - "@pureadmin/descriptions": "^1.0.0", + "@pureadmin/descriptions": "^1.1.0", "@pureadmin/table": "^0.0.1", "@vueuse/core": "^8.7.4", "@vueuse/motion": "^2.0.0-beta.12", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6d6e50e19..449fd2e62 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,7 +19,7 @@ specifiers: "@logicflow/core": ^1.1.16 "@logicflow/extension": ^1.1.16 "@pureadmin/components": ^1.0.6 - "@pureadmin/descriptions": ^1.0.0 + "@pureadmin/descriptions": ^1.1.0 "@pureadmin/table": ^0.0.1 "@pureadmin/theme": ^2.4.0 "@types/element-resize-detector": 1.1.3 @@ -124,7 +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/descriptions": 1.1.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 @@ -1353,10 +1353,10 @@ packages: vue: 3.2.37 dev: false - /@pureadmin/descriptions/1.0.0: + /@pureadmin/descriptions/1.1.0: resolution: { - integrity: sha512-fr+YLrxlmwiXTAVIKPqJbWQsRt3rqeUUz17d1BuH2Fzz8iSCd+hI4BoE1Z/bivzzoXVBC9wxBmWBSlN0n1YFAw== + integrity: sha512-Bi6lasPjc8P61kMcCXZjCd9ne99rj+whwUJ1ulKQX7JFupBhjo71Vu0TV5I7oEN52lZuvV1+F0EhJlEoIHpGFQ== } dependencies: "@element-plus/icons-vue": 2.0.6_vue@3.2.37 diff --git a/src/views/about/columns.tsx b/src/views/about/columns.tsx new file mode 100644 index 000000000..3cea1dc67 --- /dev/null +++ b/src/views/about/columns.tsx @@ -0,0 +1,67 @@ +export function useColumns() { + const { pkg, lastBuildTime } = __APP_INFO__; + const { version } = pkg; + const columns = [ + { + label: "版本", + cellRenderer: () => { + return {version}; + } + }, + { + label: "最后编译时间", + cellRenderer: () => { + return {lastBuildTime}; + } + }, + { + label: "文档地址", + cellRenderer: () => { + return ( + + 文档地址 + + ); + } + }, + { + label: "预览地址", + cellRenderer: () => { + return ( + + 预览地址 + + ); + } + }, + { + label: "Github", + cellRenderer: () => { + return ( + + Github + + ); + } + }, + { + label: "QQ交流群", + cellRenderer: () => { + return ( + + + 点击链接加入群聊【Pure Admin】 + + + ); + } + } + ]; + + return { + columns + }; +} diff --git a/src/views/about/index.vue b/src/views/about/index.vue index 9457b5ad6..f1b6a2ca8 100644 --- a/src/views/about/index.vue +++ b/src/views/about/index.vue @@ -1,4 +1,5 @@ - - - - - 您的账户已被冻结 - - 立即解冻 - - - - - - - - 您的账户还不具备申请资格 - - 立即升级 - - - - - + /> diff --git a/src/views/welcome/components/Github.vue b/src/views/welcome/components/Github.vue index 9faf5e8b5..a3af5e9f6 100644 --- a/src/views/welcome/components/Github.vue +++ b/src/views/welcome/components/Github.vue @@ -1,87 +1,31 @@ - - diff --git a/src/views/welcome/components/columns.tsx b/src/views/welcome/components/columns.tsx new file mode 100644 index 000000000..d8875d40c --- /dev/null +++ b/src/views/welcome/components/columns.tsx @@ -0,0 +1,100 @@ +import { IconifyIconOffline } from "/@/components/ReIcon"; + +export function useColumns() { + const lists = [ + { type: "", label: "善良" }, + { type: "success", label: "好学" }, + { type: "info", label: "幽默" }, + { type: "danger", label: "旅游" }, + { type: "warning", label: "追剧" } + ]; + + const columnsA = [ + { + labelRenderer: () => ( +
+ + + + 用户名 +
+ ), + value: "xiaoxian" + }, + { + labelRenderer: () => ( +
+ + + + 手机号 +
+ ), + value: "123456789" + }, + { + labelRenderer: () => ( +
+ + + + 居住地 +
+ ), + value: "上海" + } + ]; + + const columnsB = [ + { + labelRenderer: () => ( +
+ + + + 标签 +
+ ), + cellRenderer: () => { + return lists.map(v => { + return ( + + {v.label} + + ); + }); + } + }, + { + labelRenderer: () => ( +
+ + + + 联系地址 +
+ ), + value: "上海市徐汇区" + } + ]; + + const columnsC = [ + { + labelRenderer: () => ( +
+ + + + 好好学习，天天向上 +
+ ), + value: "上海市徐汇区" + } + ]; + + return { + columnsA, + columnsB, + columnsC + }; +}