Skip to content

Commit 0120d2b

Browse files
committed
feat(vue2-iview3): 适配 iview3
re #27
1 parent f03352e commit 0120d2b

File tree

29 files changed

+101
-275
lines changed

29 files changed

+101
-275
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ stats.html
44

55
packages/lib/vue2-form-element/stats.html
66
/packages/docs/docs/.vuepress/dist/
7-
/packages/demo/dist
7+
/packages/demo/demo-v2/dist
8+
/packages/demo/demo-v3/dist
89

910
# local env files
1011
.env.local

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@
153153
placeholder="ui"
154154
size="mini"
155155
style="margin-left: 10px;width: 130px;"
156+
@change="handleUiChange"
156157
>
157158
<el-option
158159
v-for="item in formComponents"
@@ -291,6 +292,23 @@ export default {
291292
this.initData();
292293
},
293294
methods: {
295+
handleUiChange(value) {
296+
const formatStr = jsonCode => JSON.stringify(JSON.parse(jsonCode));
297+
298+
this.$router.replace({
299+
query: {
300+
...this.$route.query,
301+
ui: value,
302+
schema: formatStr(this.curSchemaCode),
303+
formData: formatStr(this.curFormDataCode),
304+
uiSchema: formatStr(this.curUiSchemaCode),
305+
errorSchema: formatStr(this.curErrorSchemaCode),
306+
formFooter: formatStr(JSON.stringify(this.trueFormFooter)),
307+
formProps: formatStr(JSON.stringify(this.trueFormProps)),
308+
}
309+
});
310+
window.location.reload();
311+
},
294312
sliderFormat(value) {
295313
return value ? `${value * 4}px` : undefined;
296314
},

packages/demo/demo-v2/src/pages/schema-generator/schema-generator.js

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

5-
import '@/_common/bootstrap.js';
5+
import 'demo-common/bootstrap.js';
66

77
import Vue from 'vue';
8-
import elementUI from '@/_common/components/ElementUi/index.js';
8+
import elementUI from 'demo-common/components/ElementUi/index.js';
99
import router from './router';
1010
import App from './App';
1111

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,10 @@
136136

137137
<script>
138138
import VueJsonFrom from '@lljj/vue-json-schema-form';
139-
import componentWithDialog from '@/_common/components/component-with-dialog';
140-
import { openNewPage } from '@/_common/utils/url.js';
139+
import componentWithDialog from 'demo-common/components/component-with-dialog';
140+
import { openNewPage } from 'demo-common/utils/url.js';
141141
142-
import EditorHeader from '@/_common/components/EditorHeader.vue';
142+
import EditorHeader from 'demo-common/components/EditorHeader.vue';
143143
import FormConfSchema from './viewComponents/FormConf';
144144
import EditorToolBar from './EditorToolBar.vue';
145145
import ExportSchemaView from './components/ExportSchemaView.vue';
@@ -150,8 +150,6 @@ import { deepFreeze } from './common/utils';
150150
151151
import configTools from './config/tools';
152152
153-
import './common/registerExtraElementComponent';
154-
155153
import NestedEditor from './components/NestedEditor';
156154
import { componentList2JsonSchema, formatFormLabelWidth } from './common/editorData';
157155
import jsonSchema2ComponentList from './common/jsonSchema2ComponentList';
@@ -363,7 +361,7 @@ export default {
363361
}
364362
</style>
365363
<style module>
366-
@import 'variable.css';
364+
@import 'demo-common/css/variable.css';
367365
:root {
368366
--site-top-height: 80px;
369367
--tool-bar-width: 260px;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export default {
6868
</script>
6969

7070
<style module>
71-
@import "variable.css";
71+
@import "demo-common/css/variable.css";
7272
.box{
7373
padding: 10px;
7474
}

packages/demo/demo-v2/src/pages/schema-generator/views/editor/common/editorData.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*/
44

55
import { getDefaultFormState } from '@lljj/vue-json-schema-form';
6-
import { genId } from '@/_common/utils/id';
6+
import { genId } from 'demo-common/utils/id';
77
import { isObject, isEmptyObject } from './utils';
88

99
// 生成一个新的editor item

packages/demo/demo-v2/src/pages/schema-generator/views/editor/common/registerExtraElementComponent.js

Lines changed: 0 additions & 14 deletions
This file was deleted.

packages/demo/demo-v2/src/pages/schema-generator/views/editor/common/utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Created by Liu.Jun on 2019/11/28 18:37.
33
*/
44

5-
// import { genId } from '@/_common/utils/id';
5+
// import { genId } from 'demo-common/utils/id';
66

77
export function isObject(obj) {
88
return (Object.prototype.toString.call(obj) === '[object Object]');

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</template>
1313

1414
<script>
15-
import JsonPrettyPrint from '@/_common/components/JsonPerttyPrint.vue';
15+
import JsonPrettyPrint from 'demo-common/components/JsonPerttyPrint.vue';
1616
1717
export default {
1818
name: 'ExportSchemaView',

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
<script>
3939
import Draggable from 'vuedraggable';
40-
import * as arrayMethods from '@/_common/utils/array';
40+
import * as arrayMethods from 'demo-common/utils/array';
4141
import { generateEditorItem } from '../common/editorData';
4242
4343
// 避免循环依赖导致undefined
@@ -125,7 +125,7 @@ export default {
125125
</script>
126126

127127
<style module>
128-
@import 'variable.css';
128+
@import 'demo-common/css/variable.css';
129129
:global {
130130
.ghostItem {
131131
opacity: 0.6;

0 commit comments

Comments
 (0)