From 50b04a4adf836233fd01643ccbd5f0209f9aab2c Mon Sep 17 00:00:00 2001
From: callmeyan <yaclty2@gmail.com>
Date: Sun, 5 Jan 2025 11:01:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=8C=E6=88=90=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  4 +-
 src/components/editor/tiptap.vue              | 20 ++---
 src/pages/Layout.vue                          |  2 +-
 src/pages/result/components/input-setting.vue | 11 +--
 src/pages/result/index.vue                    | 74 +++++++++++++------
 src/pages/result/test/data-input.ts           | 10 +--
 src/pages/result/var.vue                      |  7 +-
 src/pages/result/vars.ts                      |  2 +-
 src/router.ts                                 | 18 ++---
 src/service/use-result-vars.ts                |  2 +-
 src/style.scss                                |  5 +-
 src/types/product.d.ts                        |  1 +
 tsconfig.json                                 |  6 +-
 13 files changed, 102 insertions(+), 60 deletions(-)

diff --git a/package.json b/package.json
index c4ec936..0345d1c 100644
--- a/package.json
+++ b/package.json
@@ -4,8 +4,8 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "dev": "vite --host",
-    "dev-test": "vite --host --mode=test",
+    "dev-front": "vite --host",
+    "dev-front-test": "vite --host --mode=test",
     "build": "vue-tsc && vite build",
     "preview": "vite preview"
   },
diff --git a/src/components/editor/tiptap.vue b/src/components/editor/tiptap.vue
index bc51252..ddee012 100644
--- a/src/components/editor/tiptap.vue
+++ b/src/components/editor/tiptap.vue
@@ -37,20 +37,22 @@ const editor = new Editor({
 function getMergeContent(){
     const content = editor.getJSON()
     const mergedContentList:ExpressionValue[] = [];
-    content.content?.forEach(it=>{
-        if(it.type == "paragraph" && it.content?.length > 0){
-            mergedContentList.push(it)
+    if(content.content){
+        content.content.forEach(it=>{
+            if(it.type == "paragraph" && it.content && it.content?.length > 0){
+                mergedContentList.push(it as any)
+            }
+        })
+        if(content.content.length > mergedContentList.length){
+            content.content = mergedContentList;
+            // 更新新内容
+            editor.commands.setContent(content)
         }
-    })
-    if(content.content?.length > mergedContentList.length){
-        content.content = mergedContentList;
-        // 更新新内容
-        editor.commands.setContent(content)
     }
     return content;
 }
 onMounted(() => {
-    if (model.value?.trim().length > 0) editor.commands.setContent(JSON.parse(model.value))
+    if (model.value && model.value.trim().length > 0) editor.commands.setContent(JSON.parse(model.value))
     editor.on('update', () => {
         model.value = JSON.stringify(getMergeContent())
     })
diff --git a/src/pages/Layout.vue b/src/pages/Layout.vue
index 38fa993..4a9143e 100644
--- a/src/pages/Layout.vue
+++ b/src/pages/Layout.vue
@@ -198,7 +198,7 @@ function handleHideModal() {
 }
 
 .app-main-container {
-    min-width: 1100px;
+    min-width: 500px;
     padding: 30px;
     overflow: auto;
     background: #f0f2f0;
diff --git a/src/pages/result/components/input-setting.vue b/src/pages/result/components/input-setting.vue
index 44a1997..20c9759 100644
--- a/src/pages/result/components/input-setting.vue
+++ b/src/pages/result/components/input-setting.vue
@@ -42,15 +42,15 @@
             </Tabs>
         </div>
         <template #footer>
-            <div class="flex justify-center">
+            <div class="flex justify-center mt-10">
                 <Button key="submit" type="primary" @click="handleOk">确定</Button>
             </div>
         </template>
     </Modal>
 </template>
 <script setup lang="ts">
-import {Input, Modal, Button, Tabs, TabPane} from 'ant-design-vue'
-import {defineComponent, onMounted, ref, watch} from "vue";
+import {Modal, Button, Tabs, TabPane} from 'ant-design-vue'
+import {defineComponent, onMounted, ref}  from "vue";
 import {inputProducts} from "@/pages/result/test/data-input.ts";
 
 type InputValuesType = {
@@ -62,7 +62,7 @@ type SettingItem = {
     key: string;
     placeholder: string;
     type: string;
-    unit: string;
+    unit?: string;
 }
 const inputValues = defineModel('inputValues')
 const commonValues = ref({
@@ -150,7 +150,8 @@ function handleOk() {
     }
 
     .unit {
-        @apply px-2 py-1 bg-gray-200 block h-full;
+        @apply px-2 py-1 bg-gray-200 block h-full text-center;
+        min-width: 34px;
     }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/result/index.vue b/src/pages/result/index.vue
index 45b8f8d..f587fe8 100644
--- a/src/pages/result/index.vue
+++ b/src/pages/result/index.vue
@@ -2,9 +2,10 @@
     <div class="result-container">
         <PageHeader title="输出指标编辑" description="*输出指标: 使用输入参数进行计算，可对指标进行编辑操作。">
             <Space>
-                <Button :icon="h(SettingOutlined)" :loading="loading" type="info" @click="settingVisible=true">
+                <Button :icon="h(SettingOutlined)" @click="settingVisible=true">
                     设置输入数据
                 </Button>
+                <Button @click="getResultValues">getResultValues</Button>
                 <Button :icon="h(SaveOutlined)" :loading="loading" type="primary" @click="save">保存</Button>
             </Space>
         </PageHeader>
@@ -15,9 +16,18 @@
              style="max-height: calc(100vh - 240px);margin-right:-5px;padding-right:5px;">
             <div class="result-item bg-gray-100 p-3 rounded" v-for="item in ResultExpressionList" :key="item.key">
                 <div class="result-item-title flex justify-between">
-                    <div class=" text-base font-bold">
-                        <span>{{ item.title }}</span>
-                        <!--                    <span>{{ parseExpression(item.expression) }}</span>-->
+                    <div class=" text-base">
+                        <div class=" font-bold">
+                            <span>{{ item.title }}</span>
+                            <!--                    <span>{{ parseExpression(item.expression) }}</span>-->
+                        </div>
+                        <div class="alias text-sm text-gray-400 flex item-center">
+                            <div><span>别名</span><Tooltip placement="bottom" color="#00ab99">
+                                <template #title>上一步的计算结果可用于后面表达式</template>
+                                <InfoCircleOutlined style="font-size: 12px" />
+                            </Tooltip>：</div>
+                            <div>{{item.key}}</div>
+                        </div>
                     </div>
                     <div class="action">
                         <Button :icon="h(CodeOutlined)" type="text" @click="testExpression(item)">测试公式</Button>
@@ -38,9 +48,9 @@
     </div> -->
 </template>
 <script setup lang="ts">
-import {Button, Space,App } from "ant-design-vue";
+import {Button, Space, App, Tooltip} from "ant-design-vue";
 import {h, ref} from "vue";
-import {CodeOutlined, SaveOutlined, SettingOutlined} from '@ant-design/icons-vue';
+import {CodeOutlined, SaveOutlined, SettingOutlined,InfoCircleOutlined} from '@ant-design/icons-vue';
 
 import {expressionList, saveExpression} from "@/service/api/result";
 
@@ -48,11 +58,10 @@ import PageHeader from "@/components/page-header.vue";
 import Tiptap from "@/components/editor/tiptap.vue";
 // import Button from "@/components/button/button.vue";
 import useRequest from "@/service/useRequest";
-import input from "./test/data-input.ts"
 import {getAllProduct} from "@/service/use-result-vars.ts";
 import InputSetting from "@/pages/result/components/input-setting.vue";
 
-const {notification,message,modal} = App.useApp()
+const {notification, message, modal} = App.useApp()
 const ResultExpressionList = ref<ResultExpression[]>([]);
 const inputValues = ref<{
     [key: string]: number
@@ -74,31 +83,53 @@ function runCode(expression: string, vars: any) {
     return new Function('vars', `with(vars) { return ${expression};}`)(vars)
 }
 
+function getResultValues(){
+    // 结果集
+    const result:{
+        [key: string]: number
+    } = {};
+    ResultExpressionList.value.forEach(it=>{
+        const expression = parseExpression(it.expression);
+        if(expression.length == 0) return;
+        try{
+            const value = runCode(expression, {
+                ...(productValues.value),
+                ...result,
+                input: inputValues.value,
+            })
+            result[it.key] = value;
+        }catch (e) {}
+    })
+    return result;
+    // console.log(result)
+}
 function testExpression(item: ResultExpression) {
-    try{
-        const expression = parseExpression(item.expression);
-        const result = runCode(expression, {
+    const expression = parseExpression(item.expression);
+    try {
+        const result = getResultValues()
+        const value = runCode(expression, {
             ...(productValues.value),
-            input:inputValues.value,
+            ...(result),
+            input: inputValues.value,
         })
 
-        // console.log('result', result,expression,inputValues.value)
+        console.log('result', value,expression,result) // ,JSON.stringify(productValues.value)
         notification.info({
-            message:'提示',
-            description:`${item.title}：${result}`,
-            duration:2
+            message: '提示',
+            description: `${item.title}：${value}`,
+            duration: 2
         })
-    }catch (e){
+    } catch (e) {
         modal.warning({
-            title:'测试公式失败',
-            content:`错误详情:${e.message}`
+            title: '测试公式失败',
+            content: `错误详情:${(e as Error).message}`
         })
+        console.log('expression =>', expression) // ,input,productValues.value
     }
-    // console.log('expression =>', expression,input,productValues.value)
 }
 
 function parseExpression(str: string) {
-    if (!str) return;
+    if (!str) return '';
     const doc = JSON.parse(str) as TiptapContentValue;
     if (!doc.content || doc.content.length == 0) {
         return '';
@@ -121,6 +152,7 @@ function parseExpression(str: string) {
     .tiptap {
         @apply outline-none min-h-[40px];
         line-height: 26px;
+
         :first-child {
             margin-top: 0;
         }
diff --git a/src/pages/result/test/data-input.ts b/src/pages/result/test/data-input.ts
index 4665205..06c0ea5 100644
--- a/src/pages/result/test/data-input.ts
+++ b/src/pages/result/test/data-input.ts
@@ -17,13 +17,13 @@ export const inputProducts = [
 	{ name: '伊力佳', key: 'yilijia', placeholder: '入液量（ml）', unit: 'ml', type: 'gut' },
 	{ name: '瑞易西', key: 'ruiyixi', placeholder: '入液量（ml）', unit: 'ml', type: 'gut' },
 
-	{ name: '能全素', key: 'nengquansu', placeholder: '入量（勺）', unit: 'ml', type: 'gut', addition: { key: 'nengquansu_ruye', placeholder: '入液量（ml）' } },
-	{ name: '安素', key: 'ansu', placeholder: '入量（勺）', unit: '勺', type: 'gut', addition: { key: 'ansu_ruye', placeholder: '入液量（ml）' } },
-	{ name: '全安素', key: 'quanansu', placeholder: '入量（勺）', unit: '勺', type: 'gut', addition: { key: 'quanansu_ruye', placeholder: '入液量（ml）' } },
+	{ name: '能全素', key: 'nengquansu', placeholder: '入量（勺）', unit: '勺', type: 'gut', addition: { key: 'nengquansu_ruye', placeholder: '入液量（ml）', unit: 'ml' } },
+	{ name: '安素', key: 'ansu', placeholder: '入量（勺）', unit: '勺', type: 'gut', addition: { key: 'ansu_ruye', placeholder: '入液量（ml）', unit: 'ml' } },
+	{ name: '全安素', key: 'quanansu', placeholder: '入量（勺）', unit: '勺', type: 'gut', addition: { key: 'quanansu_ruye', placeholder: '入液量（ml）', unit: 'ml' } },
 	// 新增 230409
-	{ name: '益力佳', key: 'yilijia100', placeholder: '入量（勺）', unit: 'ml', type: 'gut', addition: { key: 'yilijia100_ruye', placeholder: '入液量（ml）' } },
+	{ name: '益力佳', key: 'yilijia100', placeholder: '入量（勺）', unit: '勺', type: 'gut', addition: { key: 'yilijia100_ruye', placeholder: '入液量（ml）', unit: 'ml' } },
 	// o water
-	{ name: '乳清蛋白量(g)', key: 'ruqingdanbailiang', placeholder: '入量（g）', unit: 'g', type: 'gut', addition: { key: 'ruqingdanbailiang_ruye', placeholder: '入液量（ml）' } },
+	{ name: '乳清蛋白量(g)', key: 'ruqingdanbailiang', placeholder: '入量（g）', unit: 'g', type: 'gut', addition: { key: 'ruqingdanbailiang_ruye', placeholder: '入液量（ml）', unit: 'ml' } },
 
 	// { name: '雀巢Beneprotein', key: 'quecaoBeneprotein', placeholder: '入量（g）',unit:'g',type: 'gut' },
 	{ name: '瑞安吉', key: 'ruianji', placeholder: '入液量（ml）', unit: 'ml', type: 'gut' },
diff --git a/src/pages/result/var.vue b/src/pages/result/var.vue
index f7569a7..0236c72 100644
--- a/src/pages/result/var.vue
+++ b/src/pages/result/var.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="dropdown-menu">
-        <div class="dropdown-menu-list" v-if="items.length">
+        <div class="dropdown-menu-list" v-if="items?.length">
             <div
                 class="dropdown-item"
                 :class="{ 'is-selected': index === selectedIndex }"
@@ -42,8 +42,9 @@ const selectedIndex = ref(0)
 watch(()=>props.query, () => {
     selectedIndex.value = 0;
    if(props.query){
+       const q = String(props.query)
        varList.value = productList.value.filter(item => (
-           item.value.includes(props.query) || item.label.includes(props.query) || item.text.includes(props.query)
+           item.value.includes(q) || item.label.includes(q) || (item.text && item.text.includes(q))
        ));//.filter((_,index)=> index < 10)
    }else{
        varList.value = productList.value.filter((_,index)=> index < 10)
@@ -59,7 +60,7 @@ const downHandler = () => {
 const enterHandler = () => {
     selectItem(selectedIndex.value)
 }
-const selectItem = (index) => {
+const selectItem = (index:number) => {
     const item = varList.value[index]
     if (item) {
         props.command({id: item.value, label: item.text || item.label})
diff --git a/src/pages/result/vars.ts b/src/pages/result/vars.ts
index 35dec70..4c00825 100644
--- a/src/pages/result/vars.ts
+++ b/src/pages/result/vars.ts
@@ -4,7 +4,7 @@ import tippy from 'tippy.js'
 import vars from './var.vue'
 
 export default {
-	items: ({query}) => {
+	items: () => {
 		return ['']
 	},
 
diff --git a/src/router.ts b/src/router.ts
index 2fcd488..05ff827 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -31,15 +31,15 @@ export const routes:RouteRecordRaw[] = [
         },
         component: () => import('./pages/result/index.vue')
     },
-    {
-        path: 'ttt',
-        name: 'ttt',
-        meta: {
-            title: '输出计算',
-            icon:'icon-calculator'
-        },
-        component: () => import('./pages/T.vue')
-    },
+    // {
+    //     path: 'ttt',
+    //     name: 'ttt',
+    //     meta: {
+    //         title: '输出计算',
+    //         icon:'icon-calculator'
+    //     },
+    //     component: () => import('./pages/T.vue')
+    // },
     {
         path: 'product-data',
         name: 'product',
diff --git a/src/service/use-result-vars.ts b/src/service/use-result-vars.ts
index e653453..39ac2e7 100644
--- a/src/service/use-result-vars.ts
+++ b/src/service/use-result-vars.ts
@@ -208,7 +208,7 @@ const ValueKeys = [
 export function getAllProduct() {
 	const list = ref<{
 		[key: string]: ProductInfoModel
-	}>([])
+	}>({})
 	getList({
 		page: 1,
 		limit: 10000
diff --git a/src/style.scss b/src/style.scss
index 36c785f..cb3c38a 100644
--- a/src/style.scss
+++ b/src/style.scss
@@ -37,7 +37,7 @@
   --primary-border-radius: 3px;
 }
 ::-webkit-scrollbar {
-  width: 4px;
+  width: 6px;
   border-radius: 5px
 }
 
@@ -51,6 +51,9 @@
   background: #279b83;
   cursor: pointer
 }
+.overflow-auto{
+  scrollbar-gutter: stable;
+}
 
 [type=reset],
 [type=submit],
diff --git a/src/types/product.d.ts b/src/types/product.d.ts
index dc68f3c..f11451d 100644
--- a/src/types/product.d.ts
+++ b/src/types/product.d.ts
@@ -30,6 +30,7 @@ declare type ResultExpression = {
 	id: number;
 	key: string;
 	title: string;
+	alias: string;
 	expression: string;
 	created_at: Date | string;
 	updated_at: Date | string;
diff --git a/tsconfig.json b/tsconfig.json
index 48aa6f5..8b5cd75 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,8 +21,10 @@
 
     /* Linting */
     "strict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    "noImplicitAny": false,
+
     "noFallthroughCasesInSwitch": true
   },
   "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"],