From 19fc116f73a9a4f47396e1c3d84f6b95beb505e0 Mon Sep 17 00:00:00 2001 From: callmeyan Date: Fri, 10 Jan 2025 19:47:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8C=BF=E5=90=8D=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E6=B5=8B=E8=AF=95=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 5 +- src/components/calc/index.vue | 177 +++++++++++++++++++ src/components/login/index.vue | 2 +- src/core/string.ts | 21 +++ src/pages/product/edit-modal.vue | 2 +- src/pages/result/components/result-modal.vue | 8 +- src/pages/result/index.vue | 39 ++-- src/router.ts | 12 +- 8 files changed, 234 insertions(+), 32 deletions(-) create mode 100644 src/components/calc/index.vue diff --git a/src/App.vue b/src/App.vue index 1007ac5..c89d82f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,11 +1,14 @@ + + \ No newline at end of file diff --git a/src/components/login/index.vue b/src/components/login/index.vue index d629d87..b36788f 100644 --- a/src/components/login/index.vue +++ b/src/components/login/index.vue @@ -135,7 +135,7 @@ const handleSubmit = () => { height: 30px; line-height: 30px; color: red; - text-align: left; + text-align: center; } .form-item { diff --git a/src/core/string.ts b/src/core/string.ts index 67260aa..2e04b7a 100644 --- a/src/core/string.ts +++ b/src/core/string.ts @@ -8,4 +8,25 @@ export function getMd5(str: string) { export function formatDatetime(date: Date | string | number, format = 'YYYY-MM-DD HH:mm:ss') { if (!date) return date; return dayjs(date).format(format); +} + +export function parseExpression(str: string) { + if (!str) return ''; + const doc = JSON.parse(str) as TiptapContentValue; + if (!doc.content || doc.content.length == 0) { + return ''; + } + const expList: string[] = []; + doc.content.forEach(p=>{ + const expressionList = p.content; + if (!expressionList) return; + const expression = expressionList.map(item => { + if (item.type == 'text') { + return item.text; + } + return item.attrs.id + }).join(''); + expList.push(expression); + }) + return expList.join(''); } \ No newline at end of file diff --git a/src/pages/product/edit-modal.vue b/src/pages/product/edit-modal.vue index 81dfdd1..e45494f 100644 --- a/src/pages/product/edit-modal.vue +++ b/src/pages/product/edit-modal.vue @@ -1,5 +1,5 @@