From 948158f1fa65fe92bc3040fb0b70550a6ecefa0f Mon Sep 17 00:00:00 2001 From: Charles7c Date: Fri, 6 Sep 2024 20:21:11 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=20GiForm=20?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- pnpm-lock.yaml | 14 +++++++------- src/components/GiForm/src/type.ts | 26 +++++++++++++------------- src/main.ts | 3 ++- 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index e8d3789..404f556 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", "@arco-design/color": "^0.4.0", - "@arco-themes/vue-gi-demo": "^0.0.45", + "@arco-themes/vue-gi-demo": "^0.0.51", "@codemirror/lang-javascript": "^6.2.1", "@codemirror/lang-vue": "^0.1.2", "@codemirror/theme-one-dark": "^6.1.2", @@ -57,7 +57,7 @@ }, "devDependencies": { "@antfu/eslint-config": "^2.16.3", - "@arco-design/web-vue": "^2.55.3", + "@arco-design/web-vue": "^2.56.0", "@types/crypto-js": "^4.2.2", "@types/node": "^20.2.5", "@types/query-string": "^6.3.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d0b6ce2..2aec302 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,8 +15,8 @@ importers: specifier: ^0.4.0 version: 0.4.0 '@arco-themes/vue-gi-demo': - specifier: ^0.0.45 - version: 0.0.45(@arco-design/web-vue@2.56.0(vue@3.4.27(typescript@5.0.4))) + specifier: ^0.0.51 + version: 0.0.51(@arco-design/web-vue@2.56.0(vue@3.4.27(typescript@5.0.4))) '@codemirror/lang-javascript': specifier: ^6.2.1 version: 6.2.2 @@ -136,7 +136,7 @@ importers: specifier: ^2.16.3 version: 2.18.1(@vue/compiler-sfc@3.4.27)(eslint@9.3.0)(typescript@5.0.4) '@arco-design/web-vue': - specifier: ^2.55.3 + specifier: ^2.56.0 version: 2.56.0(vue@3.4.27(typescript@5.0.4)) '@types/crypto-js': specifier: ^4.2.2 @@ -271,10 +271,10 @@ packages: peerDependencies: vue: ^3.1.0 - '@arco-themes/vue-gi-demo@0.0.45': - resolution: {integrity: sha512-fG50CAZ3VisXNf5BWnfVl7sxBJWHkY8ZGJHzKSkoA2YY6cTSGmymQvKT7kPkFbTDQ/NBy4xH16lZirAHmcwZhQ==} + '@arco-themes/vue-gi-demo@0.0.51': + resolution: {integrity: sha512-8ud9gI2mRzcY/zvcYNJoPDZU2qI5DPRhfSQpd5sfOYsgl/YN0sDWEv5BpHJ5eQmprrBsZCfYo2NIq47qb0EtrA==} peerDependencies: - '@arco-design/web-vue': ^2.53.2 + '@arco-design/web-vue': ^2.56.0 '@babel/code-frame@7.24.2': resolution: {integrity: sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==} @@ -4929,7 +4929,7 @@ snapshots: scroll-into-view-if-needed: 2.2.31 vue: 3.4.27(typescript@5.0.4) - '@arco-themes/vue-gi-demo@0.0.45(@arco-design/web-vue@2.56.0(vue@3.4.27(typescript@5.0.4)))': + '@arco-themes/vue-gi-demo@0.0.51(@arco-design/web-vue@2.56.0(vue@3.4.27(typescript@5.0.4)))': dependencies: '@arco-design/web-vue': 2.56.0(vue@3.4.27(typescript@5.0.4)) diff --git a/src/components/GiForm/src/type.ts b/src/components/GiForm/src/type.ts index f7f7325..b58693b 100644 --- a/src/components/GiForm/src/type.ts +++ b/src/components/GiForm/src/type.ts @@ -70,19 +70,19 @@ export interface ColumnsItem { col?: A.ColProps // a-col的props, 响应式布局, 优先级大于span item?: Omit // a-form-item的props props?: - | A.InputInstance['$props'] - | A.SelectInstance['$props'] - | A.TextareaInstance['$props'] - | A.DatePickerInstance['$props'] - | A.TimePickerInstance['$props'] - | A.RadioGroupInstance['$props'] - | A.CheckboxGroupInstance['$props'] - | A.InputNumberInstance['$props'] - | A.RateInstance['$props'] - | A.SwitchInstance['$props'] - | A.SliderInstance['$props'] - | A.CascaderInstance['$props'] - | A.TreeSelectInstance['$props'] + & A.InputInstance['$props'] + & A.SelectInstance['$props'] + & A.TextareaInstance['$props'] + & A.DatePickerInstance['$props'] + & A.TimePickerInstance['$props'] + & A.RadioGroupInstance['$props'] + & A.CheckboxGroupInstance['$props'] + & A.InputNumberInstance['$props'] + & A.RateInstance['$props'] + & A.SwitchInstance['$props'] + & A.SliderInstance['$props'] + & A.CascaderInstance['$props'] + & A.TreeSelectInstance['$props'] rules?: A.FormItemInstance['$props']['rules'] // 表单校验规则 // 下拉列表|复选框组|单选框组|级联选择组件的options options?: diff --git a/src/main.ts b/src/main.ts index 2d47ef4..0039cf0 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,5 +1,5 @@ import { createApp } from 'vue' -import ArcoVue, { Card, Modal } from '@arco-design/web-vue' +import ArcoVue, { Card, Drawer, Modal } from '@arco-design/web-vue' import '@/styles/arco-ui/index.less' import 'md-editor-v3/lib/style.css' // import '@arco-themes/vue-gi-demo/index.less' @@ -33,6 +33,7 @@ Card.props.bordered = false const app = createApp(App) Modal._context = app._context +Drawer._context = app._context app.use(router) app.use(pinia)