From 392f92b204dc59a65f6863e2a4c6fe173d625c65 Mon Sep 17 00:00:00 2001
From: callmeyan <yaclty2@gmail.com>
Date: Sat, 28 Dec 2024 22:09:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/result/index.vue     |  4 +-
 src/pages/result/var.vue       |  9 ++--
 src/pages/result/vars.ts       |  2 +-
 src/service/use-result-vars.ts | 96 +++++++++++++++++-----------------
 4 files changed, 56 insertions(+), 55 deletions(-)

diff --git a/src/pages/result/index.vue b/src/pages/result/index.vue
index 9a05371..4168d0f 100644
--- a/src/pages/result/index.vue
+++ b/src/pages/result/index.vue
@@ -10,7 +10,7 @@
             <div class="result-item-title flex justify-between">
                 <div class=" text-base font-bold">
                     <span>{{ item.title }}</span>
-                    <span>{{ parseExpression(item.expression) }}</span>
+<!--                    <span>{{ parseExpression(item.expression) }}</span>-->
                 </div>
                 <div class="action">
                     <Button :icon="h(CodeOutlined)" type="primary" @click="testExpression(item)">测试</Button>
@@ -92,7 +92,7 @@ function parseExpression(str: string) {
 <style lang="scss">
 .result-item-expression {
     .tiptap {
-        @apply outline-none h-[40px];
+        @apply outline-none min-h-[40px];
 
         :first-child {
             margin-top: 0;
diff --git a/src/pages/result/var.vue b/src/pages/result/var.vue
index 55c78b4..f7569a7 100644
--- a/src/pages/result/var.vue
+++ b/src/pages/result/var.vue
@@ -44,7 +44,7 @@ watch(()=>props.query, () => {
    if(props.query){
        varList.value = productList.value.filter(item => (
            item.value.includes(props.query) || item.label.includes(props.query) || item.text.includes(props.query)
-       )).filter((_,index)=> index < 10)
+       ));//.filter((_,index)=> index < 10)
    }else{
        varList.value = productList.value.filter((_,index)=> index < 10)
    }
@@ -89,10 +89,11 @@ defineExpose({onKeyDown})
 
 <style lang="scss">
 /* Dropdown menu */
-.dropdown-menu-list{}
-.dropdown-menu-list{}
+.dropdown-menu-list{
+}
 .dropdown-menu {
-    @apply bg-white relative overflow-auto flex flex-col shadow rounded border border-gray-200;
+    @apply  bg-white relative overflow-auto flex flex-col shadow rounded border border-gray-200;
+    max-height: calc(100vh - 300px);
 }
 
 .dropdown-item {
diff --git a/src/pages/result/vars.ts b/src/pages/result/vars.ts
index 319ce8b..35dec70 100644
--- a/src/pages/result/vars.ts
+++ b/src/pages/result/vars.ts
@@ -5,7 +5,7 @@ import vars from './var.vue'
 
 export default {
 	items: ({query}) => {
-		return ['1,2,3']
+		return ['']
 	},
 
 	render: () => {
diff --git a/src/service/use-result-vars.ts b/src/service/use-result-vars.ts
index 13bf937..e653453 100644
--- a/src/service/use-result-vars.ts
+++ b/src/service/use-result-vars.ts
@@ -70,21 +70,21 @@ const inputList: InputValue[] = [
 	{name: '体重', key: 'weight',},
 	{name: '24h尿素', key: 'niaosu',},
 	// 肠内制剂
-	{name: '瑞能', key: 'ruineng', placeholder: '入液量（ml）', unit: 'ml', type: 'gut'},
-	{name: '瑞代', key: 'ruidai', placeholder: '入液量（ml）', unit: 'ml', type: 'gut'},
-	{name: '瑞先', key: 'ruixian', placeholder: '入液量（ml）', unit: 'ml', type: 'gut'},
-	{name: '瑞高', key: 'ruigao', placeholder: '入液量（ml）', unit: 'ml', type: 'gut'},
-	{name: '瑞素', key: 'ruisu', placeholder: '入液量（ml）', unit: 'ml', type: 'gut'},
-	{name: '能全力', key: 'nengquanli', placeholder: '入液量（ml）', unit: 'ml', type: 'gut'},
-	{name: '康全力', key: 'kangquanli', placeholder: '入液量（ml）', unit: 'ml', type: 'gut'},
-	{name: '康全甘', key: 'kangquangan', placeholder: '入液量（ml）', unit: 'ml', type: 'gut'}, // 新增
-	{name: '百普力', key: 'baipuli', placeholder: '入液量（ml）', unit: 'ml', type: 'gut'},
-	{name: '爱伦多', key: 'ailunduo', placeholder: '入液量（ml）', unit: 'ml', type: 'gut'},
-	{name: '维沃', key: 'weiwo', placeholder: '入液量（ml）', unit: 'ml', type: 'gut'},
+	{name: '瑞能', key: 'ruineng', placeholder: '入液量', unit: 'ml', type: 'gut'},
+	{name: '瑞代', key: 'ruidai', placeholder: '入液量', unit: 'ml', type: 'gut'},
+	{name: '瑞先', key: 'ruixian', placeholder: '入液量', unit: 'ml', type: 'gut'},
+	{name: '瑞高', key: 'ruigao', placeholder: '入液量', unit: 'ml', type: 'gut'},
+	{name: '瑞素', key: 'ruisu', placeholder: '入液量', unit: 'ml', type: 'gut'},
+	{name: '能全力', key: 'nengquanli', placeholder: '入液量', unit: 'ml', type: 'gut'},
+	{name: '康全力', key: 'kangquanli', placeholder: '入液量', unit: 'ml', type: 'gut'},
+	{name: '康全甘', key: 'kangquangan', placeholder: '入液量', unit: 'ml', type: 'gut'}, // 新增
+	{name: '百普力', key: 'baipuli', placeholder: '入液量', unit: 'ml', type: 'gut'},
+	{name: '爱伦多', key: 'ailunduo', placeholder: '入液量', unit: 'ml', type: 'gut'},
+	{name: '维沃', key: 'weiwo', placeholder: '入液量', unit: 'ml', type: 'gut'},
 	// 新增 230409
-	{name: '佳维体', key: 'jiaweiti', placeholder: '入液量（ml）', unit: 'ml', type: 'gut'},
-	{name: '伊力佳', key: 'yilijia', placeholder: '入液量（ml）', unit: 'ml', type: 'gut'},
-	{name: '瑞易西', key: 'ruiyixi', placeholder: '入液量（ml）', unit: 'ml', type: 'gut'},
+	{name: '佳维体', key: 'jiaweiti', placeholder: '入液量', unit: 'ml', type: 'gut'},
+	{name: '伊力佳', key: 'yilijia', placeholder: '入液量', unit: 'ml', type: 'gut'},
+	{name: '瑞易西', key: 'ruiyixi', placeholder: '入液量', unit: 'ml', type: 'gut'},
 
 	{
 		name: '能全素',
@@ -92,7 +92,7 @@ const inputList: InputValue[] = [
 		placeholder: '入量（勺）',
 		unit: 'ml',
 		type: 'gut',
-		addition: {key: 'nengquansu_ruye', placeholder: '入液量（ml）'}
+		addition: {key: 'nengquansu_ruye', placeholder: '入液量'}
 	},
 	{
 		name: '安素',
@@ -100,7 +100,7 @@ const inputList: InputValue[] = [
 		placeholder: '入量（勺）',
 		unit: '勺',
 		type: 'gut',
-		addition: {key: 'ansu_ruye', placeholder: '入液量（ml）'}
+		addition: {key: 'ansu_ruye', placeholder: '入液量'}
 	},
 	{
 		name: '全安素',
@@ -108,7 +108,7 @@ const inputList: InputValue[] = [
 		placeholder: '入量（勺）',
 		unit: '勺',
 		type: 'gut',
-		addition: {key: 'quanansu_ruye', placeholder: '入液量（ml）'}
+		addition: {key: 'quanansu_ruye', placeholder: '入液量'}
 	},
 	// 新增 230409
 	{
@@ -117,57 +117,57 @@ const inputList: InputValue[] = [
 		placeholder: '入量（勺）',
 		unit: 'ml',
 		type: 'gut',
-		addition: {key: 'yilijia100_ruye', placeholder: '入液量（ml）'}
+		addition: {key: 'yilijia100_ruye', placeholder: '入液量'}
 	},
 	// o water
 	{
 		name: '乳清蛋白量(g)',
 		key: 'ruqingdanbailiang',
-		placeholder: '入量（g）',
+		placeholder: '入量',
 		unit: 'g',
 		type: 'gut',
-		addition: {key: 'ruqingdanbailiang_ruye', placeholder: '入液量（ml）'}
+		addition: {key: 'ruqingdanbailiang_ruye', placeholder: '入液量'}
 	},
 
-	// { name: '雀巢Beneprotein', key: 'quecaoBeneprotein', placeholder: '入量（g）',unit:'g',type: 'gut' },
-	{name: '瑞安吉', key: 'ruianji', placeholder: '入液量（ml）', unit: 'ml', type: 'gut'},
+	// { name: '雀巢Beneprotein', key: 'quecaoBeneprotein', placeholder: '入量',unit:'g',type: 'gut' },
+	{name: '瑞安吉', key: 'ruianji', placeholder: '入液量', unit: 'ml', type: 'gut'},
 
 	// 静脉制剂
-	// { name: '卡文1440ml', key: 'kawen1440', placeholder: '入液量（ml）', unit:'ml', type: 'vein' },
-	// { name: '卡文1920ml', key: 'kawen1920', placeholder: '入液量（ml）', unit:'ml', type: 'vein' },
+	// { name: '卡文1440ml', key: 'kawen1440', placeholder: '入液量', unit:'ml', type: 'vein' },
+	// { name: '卡文1920ml', key: 'kawen1920', placeholder: '入液量', unit:'ml', type: 'vein' },
 	// 新增 230409
-	{name: '水', key: 'shui', placeholder: '入液量（ml）', unit: 'ml', type: 'gut'},
-	{name: '全营达', key: 'quanyingda', placeholder: '入液量（ml）', unit: 'ml', type: 'vein'},
-	{name: '力卡文', key: 'likawen', placeholder: '入液量（ml）', unit: 'ml', type: 'vein'},
+	{name: '水', key: 'shui', placeholder: '入液量', unit: 'ml', type: 'gut'},
+	{name: '全营达', key: 'quanyingda', placeholder: '入液量', unit: 'ml', type: 'vein'},
+	{name: '力卡文', key: 'likawen', placeholder: '入液量', unit: 'ml', type: 'vein'},
 
 
-	{name: '乐凡命8.5%', key: 'lefanming85', placeholder: '入液量（ml）', unit: 'ml', type: 'vein'},
-	{name: '乐凡命11.4%', key: 'lefanming114', placeholder: '入液量（ml）', unit: 'ml', type: 'vein'},
+	{name: '乐凡命8.5%', key: 'lefanming85', placeholder: '入液量', unit: 'ml', type: 'vein'},
+	{name: '乐凡命11.4%', key: 'lefanming114', placeholder: '入液量', unit: 'ml', type: 'vein'},
 	{
 		name: '其他氨基酸',
 		key: 'anjisuan',
-		placeholder: '入液量（ml）',
+		placeholder: '入液量',
 		unit: 'ml',
 		type: 'vein',
 		addition: {key: 'anjisuan_ruye', placeholder: '', unit: '%',}
 	},
-	{name: '力太', key: 'litai', placeholder: '入液量（ml）', unit: 'ml', type: 'vein'},
+	{name: '力太', key: 'litai', placeholder: '入液量', unit: 'ml', type: 'vein'},
 
-	{name: '力能', key: 'lineng', placeholder: '入液量（ml）', unit: 'ml', type: 'vein'},
-	{name: '力文', key: 'liwen', placeholder: '入液量（ml）', unit: 'ml', type: 'vein'},
-	{name: '尤文', key: 'youwen', placeholder: '入液量（ml）', unit: 'ml', type: 'vein'},
-	{name: '英脱利匹特20%', key: 'yingtuolipite20', placeholder: '入液量（ml）', unit: 'ml', type: 'vein'},// 新增
-	{name: '英脱利匹特30%', key: 'yingtuolipite30', placeholder: '入液量（ml）', unit: 'ml', type: 'vein'},// 新增
-	{name: '5%葡萄糖氯化钠', key: 'putaotangluhuana5', placeholder: '入液量（ml）', unit: 'ml', type: 'vein'},// 新增
-	{name: '5%葡萄糖', key: 'putaotang5', placeholder: '入液量（ml）', unit: 'ml', type: 'vein'},
-	{name: '10%葡萄糖', key: 'putaotang10', placeholder: '入液量（ml）', unit: 'ml', type: 'vein'},
-	{name: '50%葡萄糖', key: 'putaotang50', placeholder: '入液量（ml）', unit: 'ml', type: 'vein'},
-	{name: '0.9%氯化钠', key: 'luhuana09', placeholder: '入液量（ml）', unit: 'ml', type: 'vein'},
-	{name: '10%氯化钠', key: 'luhuana10', placeholder: '入液量（ml）', unit: 'ml', type: 'vein'},
-	{name: '格列福斯', key: 'geliefusi', placeholder: '入液量（ml）', unit: 'ml', type: 'vein'},
-	{name: '氯化钾', key: 'luhuajia', placeholder: '入液量（ml）', unit: 'ml', type: 'vein'},
-	// { name: '其他液体', key: 'qitayeti', placeholder: '入液量（ml）', unit:'ml', type: 'vein' }, // 新增
-	{name: '白蛋白', key: 'baidanbai', placeholder: '入液量（g）', unit: 'ml', type: 'vein'}, // 新增
+	{name: '力能', key: 'lineng', placeholder: '入液量', unit: 'ml', type: 'vein'},
+	{name: '力文', key: 'liwen', placeholder: '入液量', unit: 'ml', type: 'vein'},
+	{name: '尤文', key: 'youwen', placeholder: '入液量', unit: 'ml', type: 'vein'},
+	{name: '英脱利匹特20%', key: 'yingtuolipite20', placeholder: '入液量', unit: 'ml', type: 'vein'},// 新增
+	{name: '英脱利匹特30%', key: 'yingtuolipite30', placeholder: '入液量', unit: 'ml', type: 'vein'},// 新增
+	{name: '5%葡萄糖氯化钠', key: 'putaotangluhuana5', placeholder: '入液量', unit: 'ml', type: 'vein'},// 新增
+	{name: '5%葡萄糖', key: 'putaotang5', placeholder: '入液量', unit: 'ml', type: 'vein'},
+	{name: '10%葡萄糖', key: 'putaotang10', placeholder: '入液量', unit: 'ml', type: 'vein'},
+	{name: '50%葡萄糖', key: 'putaotang50', placeholder: '入液量', unit: 'ml', type: 'vein'},
+	{name: '0.9%氯化钠', key: 'luhuana09', placeholder: '入液量', unit: 'ml', type: 'vein'},
+	{name: '10%氯化钠', key: 'luhuana10', placeholder: '入液量', unit: 'ml', type: 'vein'},
+	{name: '格列福斯', key: 'geliefusi', placeholder: '入液量', unit: 'ml', type: 'vein'},
+	{name: '氯化钾', key: 'luhuajia', placeholder: '入液量', unit: 'ml', type: 'vein'},
+	// { name: '其他液体', key: 'qitayeti', placeholder: '入液量', unit:'ml', type: 'vein' }, // 新增
+	{name: '白蛋白', key: 'baidanbai', placeholder: '入液量', unit: 'ml', type: 'vein'}, // 新增
 ]
 
 export function getInputValue() {
@@ -184,8 +184,8 @@ export function getInputValue() {
 		}
 		const ext = item.placeholder || item.unit
 		list.push({
-			label: `${item.name}${ext ? '-' + ext : ''}`,
-			text: `${item.name}${ext ? '-' + ext : ''}`,
+			text: `${ext?`${ext}(${item.name})`:item.name}`,
+			label: `${ext?`ruye(${item.name})`:item.name}`,
 			value: `input.${item.key}`,
 		})
 	})