From 55fb0bb6fa207b6110c5ddb6876777146cc4bbd2 Mon Sep 17 00:00:00 2001 From: xuliangzhan Date: Tue, 5 Oct 2021 17:38:28 +0800 Subject: [PATCH] =?UTF-8?q?form=20=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/api/form.js | 32 +- examples/api/grid.js | 14 +- examples/api/table.js | 4 +- examples/views/form/Form.vue | 976 ++++++++++++++------------- examples/views/table/start/Theme.vue | 17 +- examples/views/textarea/Textarea.vue | 4 +- helper/vetur/attributes.json | 8 + helper/vetur/tags.json | 2 + package.json | 4 +- packages/form/src/form-gather.js | 10 + packages/form/src/form-item.js | 102 ++- packages/form/src/form.js | 156 ++--- packages/form/src/render.js | 79 +++ packages/grid/src/grid.js | 7 +- packages/table/src/body.js | 16 +- styles/variable.scss | 386 +++++------ 16 files changed, 1024 insertions(+), 793 deletions(-) create mode 100644 packages/form/src/render.js diff --git a/examples/api/form.js b/examples/api/form.js index 9858abe36..c6647247d 100644 --- a/examples/api/form.js +++ b/examples/api/form.js @@ -113,6 +113,24 @@ const apis = [ defVal: '', list: [] }, + { + name: 'collapse-status', + desc: 'v-model 绑定值,折叠状态', + version: '3.3.14', + type: 'boolean', + enum: '', + defVal: 'true', + list: [] + }, + { + name: 'custom-layout', + desc: '是否使用自定义布局', + version: '3.3.14', + type: 'boolean', + enum: '', + defVal: '默认 false,继承 setup.form.customLayout', + list: [] + }, { name: 'items', desc: '项列表', @@ -308,11 +326,21 @@ const apis = [ }, { name: 'toggle-collapse', - desc: '当折叠按钮被手动点击时会触发该事件', + desc: '即将废弃,请使用 collapse', + disabled: true, version: '', type: '', enum: '', - defVal: '{ collapse, data, $event }', + defVal: '{ status, data, $event }', + list: [] + }, + { + name: 'collapse', + desc: '当折叠按钮被手动点击时会触发该事件', + version: '3.3.14', + type: '', + enum: '', + defVal: '{ status, data, $event }', list: [] } ] diff --git a/examples/api/grid.js b/examples/api/grid.js index 8e315e6b0..2a7a738b1 100644 --- a/examples/api/grid.js +++ b/examples/api/grid.js @@ -525,11 +525,21 @@ const apis = [ }, { name: 'form-toggle-collapse', - desc: '只对 form-config 配置时有效,当折叠按钮被手动点击时会触发该事件', + desc: '即将废弃,请使用 form-collapse', + disabled: true, version: '', type: '', enum: '', - defVal: '{ collapse, data, $event }', + defVal: '{ status, data, $event }', + list: [] + }, + { + name: 'form-collapse', + desc: '只对 form-config 配置时有效,当折叠按钮被手动点击时会触发该事件', + version: '3.3.14', + type: '', + enum: '', + defVal: '{ status, data, $event }', list: [] }, { diff --git a/examples/api/table.js b/examples/api/table.js index 786f8d666..10d24d9e9 100644 --- a/examples/api/table.js +++ b/examples/api/table.js @@ -3133,7 +3133,7 @@ const apis = [ version: '', type: '', enum: '', - defVal: '{ type, scrollTop, scrollLeft, isX, isY, $event }', + defVal: '{ type, scrollTop, scrollLeft, bodyWidth, bodyHeight, isX, isY, $event }', list: [] }, { @@ -3431,7 +3431,7 @@ const apis = [ version: '', type: 'Promise<{row, rows}>', enum: '', - defVal: 'records: object | Array, row?: Row', + defVal: 'records: object | Array, row?: Row | -1 | 0', list: [] }, { diff --git a/examples/views/form/Form.vue b/examples/views/form/Form.vue index 28f90b5c9..0bbf491ca 100644 --- a/examples/views/form/Form.vue +++ b/examples/views/form/Form.vue @@ -3,181 +3,193 @@

{{ $t('app.aside.nav.form') }}

表单,查看 API,可以通过 setup 设置全局参数
- (注:重置功能需要配置 item-render 的项有效,如果不需要自动重置,可以不用设置) + 默认渲染方式为配置式,不支持自定义的布局,可以通过设置 custom-layout 切换为自定义布局
+ (注:重置功能只对配置 item-render 的项有效)

-

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -

- - - - - - - - - - - - - - - - - - - - - - - - - - -

+

{{ $t('app.body.button.showCode') }}

-

- - +

+      {{ demoCodes[0] }}
+      {{ demoCodes[1] }}
+    
+ + + + + + - + + + + + + + + + + + + + + + + + + + + +

{{ $t('app.body.button.showCode') }}

+ +
+      {{ demoCodes[2] }}
+      {{ demoCodes[3] }}
+    
+ + +
使用自定义布局
+ + + +
+ - + @@ -188,67 +200,63 @@ - + - - - - + - - - - +
+ +
+ - - - - + - - - - -

+
+ + + +
+
+
-

- - - -

+

{{ $t('app.body.button.showCode') }}

+ +
+      {{ demoCodes[4] }}
+      {{ demoCodes[5] }}
+    
+ + + + + +

{{ $t('app.body.button.showCode') }}

+ +
+      {{ demoCodes[6] }}
+      {{ demoCodes[7] }}
+    
       
@@ -257,13 +265,6 @@
         | Enter | (prevent-submit 不为 false)如果有存在提交按钮则提交表单 |
       
     
- -

{{ $t('app.body.button.showCode') }}

- -
-      {{ demoCodes[0] }}
-      {{ demoCodes[1] }}
-    
@@ -314,6 +315,7 @@ export default { { required: true, message: '必填校验' } ] }, + collapseStatus3: true, formData3: { name: '', nickname: '', @@ -364,249 +366,106 @@ export default { ], demoCodes: [ ` -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- -

- - - - - - - - - - - - - - - - - - - - - - - - - - -

- -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- -

- -