From 8f695d09a3a2b60b77369410d1548305c4790aef Mon Sep 17 00:00:00 2001
From: callmeyan <yaclty2@gmail.com>
Date: Tue, 9 Jan 2024 22:34:12 +0800
Subject: [PATCH] fixed ts error

---
 src/components/data-fields/index.vue |  4 +-
 src/components/layout/index.vue      | 91 ----------------------------
 src/components/product/index.vue     |  6 +-
 src/pages/Layout.vue                 |  3 +-
 4 files changed, 7 insertions(+), 97 deletions(-)
 delete mode 100644 src/components/layout/index.vue

diff --git a/src/components/data-fields/index.vue b/src/components/data-fields/index.vue
index 790ac71..85dfe44 100644
--- a/src/components/data-fields/index.vue
+++ b/src/components/data-fields/index.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import {ref} from "vue";
 import {fields, getProductValues,saveProductValues} from '../../service/data'
-import {Button, Input} from "view-ui-plus";
+import {Button, Input} from "ant-design-vue";
 const values = getProductValues()
 const productValues = ref(values)
 const onInputPaste = (e: ClipboardEvent, pIndex: number, fIndex: number) => {
@@ -44,7 +44,7 @@ const onInputPaste = (e: ClipboardEvent, pIndex: number, fIndex: number) => {
                 <Button type="primary" @click="saveProductValues(productValues)">保存数据</Button>
             </div>
             <div class="calculator">
-                <Input type="textarea" :rows="4" placeholder="请输入计算公式"/>
+                <Input :rows="4" placeholder="请输入计算公式"/>
             </div>
         </div>
     </div>
diff --git a/src/components/layout/index.vue b/src/components/layout/index.vue
deleted file mode 100644
index 03cb102..0000000
--- a/src/components/layout/index.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<script setup lang="ts">
-import DataFields from "../../components/data-fields/index.vue";
-import {Breadcrumb, BreadcrumbItem, Card, Content, Header, Icon, Layout, Menu, MenuItem} from "view-ui-plus";
-import {ref} from "vue";
-
-const MENU_LIST = [
-    {title:'药品管理',name:'products',icon:'ios-cube'},
-    {title:'数据项管理',name:'fields',icon:'ios-apps'},
-    {title:'数据管理',name:'product_value',icon:'ios-paper'},
-    {title:'计算结果',name:'result',icon:'ios-calculator'},
-]
-const activeMenu = ref(MENU_LIST[0].name)
-const onMenuSelect = (name:string)=>activeMenu.value = name
-</script>
-
-<template>
-    <Layout class="layout">
-        <Header>
-            <div class="layout-logo">
-                <img class="logo" src="../../assets/images/logo.png" alt="" />
-            </div>
-            <div class="layout-nav">
-                <Menu mode="horizontal" :active-name="activeMenu" @on-select="onMenuSelect">
-                    <MenuItem v-for="m in MENU_LIST" :key="m.name" :name="m.name">
-                        <Icon :type="m.icon" size="20" />
-                        <span>{{ m.title }}</span>
-                    </MenuItem>
-                </Menu>
-            </div>
-        </Header>
-        <Content :style="{padding: '0 50px'}">
-            <Breadcrumb :style="{margin: '20px 0'}">
-                <BreadcrumbItem>Home</BreadcrumbItem>
-                <BreadcrumbItem>Components</BreadcrumbItem>
-                <BreadcrumbItem>Layout</BreadcrumbItem>
-            </Breadcrumb>
-            <Card>
-                <div style="min-height: 200px;">
-                    <DataFields v-if="activeMenu == 'product_value'"/>
-                </div>
-            </Card>
-        </Content>
-        <Footer class="layout-footer-center">2011-2016 &copy; View Design</Footer>
-    </Layout>
-</template>
-
-<style scoped lang="scss">
-
-.layout{
-    border: 1px solid #d7dde4;
-    background: #f5f7f9;
-    position: relative;
-    border-radius: 4px;
-    overflow: hidden;
-    .ivu-layout-header {
-        background: #fff;
-    }
-    .ivu-menu{
-        &:after{
-            display: none;
-        }
-    }
-}
-.layout-logo{
-    width: 100px;
-    height: 30px;
-    border-radius: 3px;
-    float: left;
-    position: relative;
-    top: 15px;
-    left: 20px;
-}
-.layout-nav{
-    width: 420px;
-    margin: 0 20px 0 auto;
-}
-.layout-footer-center{
-    text-align: center;
-}
-.layout-topMiddleBottom .ivu-menu-light{
-    background:none;
-    color: #fff
-}
-
-.logo {
-    height: 34px;
-    will-change: filter;
-    transition: filter 300ms;
-}
-
-</style>
diff --git a/src/components/product/index.vue b/src/components/product/index.vue
index 4581a47..0019202 100644
--- a/src/components/product/index.vue
+++ b/src/components/product/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { Button, Input, Space, Message } from "view-ui-plus";
+import { Button, Input, Space, message } from "ant-design-vue";
 import { ref } from "vue";
 
 const values = ref({ a: 1, b: 22, c: 3 })
@@ -29,7 +29,7 @@ function sandbox(code: string) {
 
 const onCalculate = () => {
     if (expression.value.length === 0) {
-        Message.warning("请输入表达式")
+        message.warning("请输入表达式")
         return;
     }
     // 从expression获取计算表达式并读取values中的参数计算最终数据
@@ -62,7 +62,7 @@ const onCalculate = () => {
                 <Input type="number" v-model="values.c" />
             </Space>
             <div class="calculator">
-                <Input v-model="expression" type="textarea" :rows="4" placeholder="请输入计算公式" />
+                <Input v-model="expression" :rows="4" placeholder="请输入计算公式" />
             </div>
             <Button @click="onCalculate">计算</Button>
             <div v-if="expression.length > 0 && result">结果:{{ expression }} = {{ result }}</div>
diff --git a/src/pages/Layout.vue b/src/pages/Layout.vue
index 9aa0dcc..2f400dd 100644
--- a/src/pages/Layout.vue
+++ b/src/pages/Layout.vue
@@ -6,6 +6,7 @@ import { computed, ref } from "vue";
 import { AppConfig } from "../app-config.ts";
 import { Dropdown, Menu, MenuItem, Button } from "ant-design-vue";
 import { DownOutlined } from "@ant-design/icons-vue"
+import { MenuInfo } from "ant-design-vue/es/menu/src/interface";
 // 获取用户数据
 const store = useUserStore()
 const showLogo = ref(false)
@@ -17,7 +18,7 @@ const currentMenus = computed(() => {
         return !s.meta || !s.meta['role'] || store.userInfo?.role == s.meta.role;
     })
 })
-const handleMenuClick = ({ key }: { key: string }) => {
+const handleMenuClick = ({ key }: MenuInfo) => {
     console.log('click menu', key)
     if (key == 'logout') {
         store.logout()