Skip to content

Commit 71a2810

Browse files
committed
feat(vue3-ant): 更新初始化
feat(vue3-antdv): 适配 a-form feat(vue3-ant): 更新a-form fix(vue3-elementplus): 修复elementPlus popover 组件渲染异常问题 fix #27 fix(vue3): 修复vue3版本inline 设置无效问题 fix #27 feat(core): 优化core 配置项 feat(vue3-antdv): 支持 a-form validate chore(vue3-antdv): 添加注释 feat(vue3-antdv): 完成 formItem 对子元素输入监听 feat(vue3-antdv): 完成 antdv基础组件 fix(vue3-antdv): 修复 formItem name参数需要数组的问题 feat(vue3-antdv): 适配checkbox radio select组件 feat(vue3-antdv): 更新样式 feat(vue3-antdv): 添加vue3-antdv 时间日期相关组件 feat(antdv): antdv 添加时间日期选择 feat(vue3-antdv): 添加upload 上传组件适配 feat(vue3-antdv): 优化图片上传逻辑 feat(vue3-antdv): 优化antdv适配体验 feat(vue3-antdv): 添加 on-form-mounted emit,支持获取form组件实例 re #27 chore(lib): 调整图标为统一内置svg,不再各ui框架单独配置 feat(vue3 antdv): 兼容ant vue v-model组件不使用moduleValue feat(vue3-antdv): 适配vue3-antdv hack首元素不是输入组件时正常校验 re #40 build(lib): build lib docs(docs): 更新文档 chore(playground): 优化地址跳转体验 chore(playground): 更新 vue ant到正式版本 chore(lib): 更新依赖版本
1 parent 24f299a commit 71a2810

File tree

95 files changed

+27547
-808
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+27547
-808
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ yarn run demo:dev --dir=vue-editor
5050

5151
### 说明
5252
* 遵循 `JSON Schema` 规范,只需要给定 `JSON Schema`,即可生成对应的form表单
53-
* 快速配置个性化ui视图和校验错误信息,可适配常用的ui库,目前的版本默认视图依赖 `elementUi`
53+
* 快速配置个性化ui视图和校验错误信息,可适配常用的ui库
5454
* 表单schema校验使用 [ajv](https://github.com/epoberezkin/ajv)
5555
* 设计思想和对schema解析索引参考 [react-jsonschema-form](https://github.com/rjsf-team/react-jsonschema-form)
5656

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@
1212
"scripts": {
1313
"docs:dev": "yarn workspace docs dev",
1414
"docs:build": "yarn workspace docs build",
15-
"lib:build": "yarn lib-element:build && yarn lib-iview3:build && yarn lib3-element:build",
15+
"lib:build": "yarn lib-element:build && yarn lib-iview3:build && yarn lib3-element:build && yarn lib3-ant:build",
1616
"lib-element:watch": "yarn workspace @lljj/vue-json-schema-form watch",
1717
"lib-element:build": "yarn workspace @lljj/vue-json-schema-form build",
1818
"lib-iview3:watch": "yarn workspace @lljj/vue2-form-iview3 watch",
1919
"lib-iview3:build": "yarn workspace @lljj/vue2-form-iview3 build",
2020
"lib3-element:watch": "yarn workspace @lljj/vue3-form-element watch",
2121
"lib3-element:build": "yarn workspace @lljj/vue3-form-element build",
22+
"lib3-ant:watch": "yarn workspace @lljj/vue3-form-ant watch",
23+
"lib3-ant:build": "yarn workspace @lljj/vue3-form-ant build",
2224
"demo:dev": "yarn workspace demo dev",
2325
"demo:build": "yarn workspace demo build",
2426
"demo3:dev": "yarn workspace demo-v3 dev",
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/**
2+
* Created by Liu.Jun on 2021/2/1 10:00 下午.
3+
*/
4+
5+
import Antd from 'ant-design-vue';
6+
7+
// eslint-disable-next-line import/no-webpack-loader-syntax
8+
import '!vue-style-loader!css-loader!ant-design-vue/dist/antd.css';
9+
10+
export default {
11+
install(app) {
12+
app.use(Antd);
13+
}
14+
};

packages/demo/demo-common/components/EditorHeader.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export default {
6666
window.location.href = window.location.href.replace(
6767
`${window.location.origin}${val === 'vue3' ? '' : '/v3'}`,
6868
`${window.location.origin}${val === 'vue3' ? '/v3' : ''}`
69-
);
69+
).replace(/&ui=.*?&/, '&');
7070
},
7171
}
7272
};

packages/demo/demo-common/components/iView/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import iView from 'iview';
77

88
export default {
99
install(Vue) {
10+
// debugger;
1011
Vue.use(iView);
1112
}
1213
};

packages/demo/demo-common/schemaTypes/14.Number/index.js

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,25 @@
22
* Created by Liu.Jun on 2020/5/17 10:18 下午.
33
*/
44

5+
let sliderName = 'el-slider';
6+
const sliderNameRules = {
7+
'ui=VueAntForm': 'SliderWidget',
8+
'ui=VueIview3Form': 'slider'
9+
};
10+
11+
const curUrl = window.location.href;
12+
Object.entries(sliderNameRules).some(([key, value]) => {
13+
const isInclude = ~curUrl.indexOf(key);
14+
15+
if (isInclude) {
16+
sliderName = value;
17+
return true;
18+
}
19+
20+
return false;
21+
});
22+
23+
524
export default {
625
schema: {
726
type: 'object',
@@ -48,10 +67,10 @@ export default {
4867
'ui:enumNames': ['ui-radio1', 'ui-radio2', 'ui-radio3']
4968
},
5069
integerRange: {
51-
'ui:widget': 'el-slider',
70+
'ui:widget': sliderName
5271
},
5372
integerRangeSteps: {
54-
'ui:widget': 'el-slider',
73+
'ui:widget': sliderName
5574
},
5675
},
5776
formData: {

packages/demo/demo-v2/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
"lint": "vue-cli-service lint"
1010
},
1111
"dependencies": {
12+
"demo-common": "1.0.0",
1213
"@lljj/polyfill": "^0.1.0",
1314
"@lljj/vue-json-schema-form": "1.0.2",
1415
"@lljj/vue2-form-iview3": "1.0.2",
1516
"ajv-i18n": "^3.5.0",
16-
"element-ui": "^2.14.1",
1717
"iview": "^3.5.4",
1818
"vue": "^2.6.10",
1919
"vuedraggable": "2.23.2"

packages/demo/demo-v2/src/pages/index/views/Demo/index.vue

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
:to="{
8888
name: 'demo',
8989
query: {
90+
ui: curVueForm,
9091
type: item
9192
}
9293
}"
@@ -177,6 +178,7 @@
177178
:custom-formats="customFormats"
178179
:form-footer="trueFormFooter"
179180
:form-props="trueFormProps"
181+
@on-form-mounted="handleFormMounted"
180182
@on-change="handleDataChange"
181183
@on-cancel="handleCancel"
182184
@on-submit="handleSubmit"
@@ -377,6 +379,9 @@ export default {
377379
formProps
378380
}));
379381
},
382+
handleFormMounted(formRef) {
383+
console.log('Ui form component:', formRef);
384+
},
380385
handleDataChange() {
381386
console.log('Data change');
382387
},
@@ -405,6 +410,7 @@ export default {
405410
406411
const genRoute = this.$router.resolve({
407412
query: {
413+
ui: this.curVueForm,
408414
type: 'Test',
409415
ui: this.curVueForm,
410416
schema: formatStr(this.curSchemaCode),

packages/demo/demo-v2/src/pages/schema-generator/views/editor/Editor.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
:class="{
5757
layoutColumn: !formProps.inline,
5858
[`layoutColumn-${formProps.layoutColumn}`]: !formProps.inline,
59-
[`formLabel-${formProps.labelPosition}`]: true,
6059
formInlineFooter: formProps.inlineFooter,
6160
formInline: formProps.inline,
6261
// [`genFromComponent_${schema.id}Form`]: !!schema.id,

packages/demo/demo-v3/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@
99
"lint": "vue-cli-service lint"
1010
},
1111
"dependencies": {
12+
"demo-common": "1.0.0",
1213
"@lljj/polyfill": "^0.1.0",
1314
"@lljj/vue3-form-element": "1.0.2",
15+
"@lljj/vue3-form-ant": "1.0.2",
1416
"ajv-i18n": "^3.5.0",
15-
"demo-common": "1.0.0",
17+
"ant-design-vue": "^2.0.1",
1618
"vue": "^3.0.0",
1719
"vuedraggable": "2.23.2"
1820
},

0 commit comments

Comments
 (0)