From 7f9fb8232b960b3f2b6057a10262f3a56e99c610 Mon Sep 17 00:00:00 2001 From: Lam Phan Dang Date: Sat, 23 Nov 2019 18:18:01 +0700 Subject: [PATCH 01/24] Migrate from Vuetify to GigaComponents --- .storybook/config.js | 1 - package.json | 4 +- src/form/FormFactory.js | 4 +- src/form/GField.vue | 120 +++++++++---------- src/form/GFieldChoice.vue | 90 +++++++++------ src/form/GFieldChoiceArray.vue | 67 +++++++---- src/form/GFieldObject.vue | 199 ++++++++++++++++++-------------- src/form/GFieldObjectArray.vue | 52 +++++---- src/form/GFieldSimpleArray.vue | 32 +++--- src/form/GFieldTableArray.vue | 203 +++++++++++++++++---------------- src/form/GInput.vue | 197 ++++++++++++++++---------------- src/main.js | 2 + src/plugins/giga-components.js | 7 ++ src/plugins/vuetify.js | 8 -- src/stories/FormStory2.vue | 168 ++++++++------------------- 15 files changed, 581 insertions(+), 573 deletions(-) create mode 100644 src/plugins/giga-components.js delete mode 100644 src/plugins/vuetify.js diff --git a/.storybook/config.js b/.storybook/config.js index aaa61bd..a79da9e 100644 --- a/.storybook/config.js +++ b/.storybook/config.js @@ -14,7 +14,6 @@ addParameters({ Vue.use(VueRouter); Vue.use(VueCompositionAPI); -import '../src/plugins/vuetify'; import { storiesOf, specs, describe, it, diff --git a/package.json b/package.json index 3249b5d..500531d 100644 --- a/package.json +++ b/package.json @@ -77,6 +77,7 @@ "material-design-icons-iconfont": "^4.0.2", "node-sass": "^4.9.0", "nodemon": "^1.19.3", + "pos-vue-framework": "file:pos-vue-framework", "prettier": "^1.18.2", "resolve-url-loader": "^3.1.0", "roboto-fontface": "^0.10.0", @@ -93,8 +94,7 @@ "vue-loader": "^15.7.1", "vue-router": "^3.1.3", "vue-template-compiler": "^2.6.10", - "vue-the-mask": "^0.11.1", - "vuetify": "^1.3.12" + "vue-the-mask": "^0.11.1" }, "postcss": { "plugins": { diff --git a/src/form/FormFactory.js b/src/form/FormFactory.js index e4ee54f..89f5df7 100644 --- a/src/form/FormFactory.js +++ b/src/form/FormFactory.js @@ -1,4 +1,4 @@ -import { computed } from '@vue/composition-api'; +import {computed} from '@vue/composition-api'; export const _modelFactory = (props) => computed(() => { if (typeof props.field.key !== 'undefined') return props.model[props.field.key]; @@ -6,7 +6,7 @@ export const _modelFactory = (props) => computed(() => { }); export const flexFactory = (props) => computed(() => { - return props.noLayout ? 'xs12' : props.field.flex; + return props.noLayout ? 'xs-12' : props.field.flex; }); export const _rootModelFactory = (props) => computed(() => { diff --git a/src/form/GField.vue b/src/form/GField.vue index 2c4ea19..f5207b5 100644 --- a/src/form/GField.vue +++ b/src/form/GField.vue @@ -1,64 +1,60 @@ diff --git a/src/form/GFieldObjectArray.vue b/src/form/GFieldObjectArray.vue index e219bce..28aacbe 100644 --- a/src/form/GFieldObjectArray.vue +++ b/src/form/GFieldObjectArray.vue @@ -1,24 +1,36 @@ diff --git a/src/form/GInput.vue b/src/form/GInput.vue index 57db505..81c2b7b 100644 --- a/src/form/GInput.vue +++ b/src/form/GInput.vue @@ -1,58 +1,57 @@ diff --git a/src/main.js b/src/main.js index 9ff029c..c787dbe 100644 --- a/src/main.js +++ b/src/main.js @@ -8,10 +8,12 @@ import GFieldChoice from './form/GFieldChoice'; import GFieldChoiceArray from './form/GFieldChoiceArray'; import GFieldObjectArray from './form/GFieldObjectArray'; import GFieldObject from './form/GFieldObject'; +import GigaComponents from "./plugins/giga-components"; let GForm = { install(Vue, options) { //Vue.yourMethod = (value) => value + Vue.use(GigaComponents); Vue.use(VueColumnsResizable); Vue.component('GField', GField); Vue.component('GFieldSimpleArray', GFieldSimpleArray); diff --git a/src/plugins/giga-components.js b/src/plugins/giga-components.js new file mode 100644 index 0000000..62aee2b --- /dev/null +++ b/src/plugins/giga-components.js @@ -0,0 +1,7 @@ +import Vue from 'vue'; +import GigaComponents from "pos-vue-framework"; +import 'pos-vue-framework/src/style/main.scss'; + +Vue.use(GigaComponents, {}); + +export default GigaComponents; diff --git a/src/plugins/vuetify.js b/src/plugins/vuetify.js deleted file mode 100644 index c6bb482..0000000 --- a/src/plugins/vuetify.js +++ /dev/null @@ -1,8 +0,0 @@ -import Vue from 'vue' -import Vuetify from 'vuetify' -import 'vuetify/src/stylus/app.styl' - -Vue.use(Vuetify, { - customProperties: true, - iconfont: 'md', -}) diff --git a/src/stories/FormStory2.vue b/src/stories/FormStory2.vue index a96fe53..7e751f1 100644 --- a/src/stories/FormStory2.vue +++ b/src/stories/FormStory2.vue @@ -1,78 +1,26 @@ - - From 74ae07127c123e1684e8f2249938271bf0ae8712 Mon Sep 17 00:00:00 2001 From: Lam Phan Dang Date: Mon, 25 Nov 2019 10:04:54 +0700 Subject: [PATCH 02/24] Create .gitmodules --- .gitmodules | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..1d2b0fe --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "pos-vue-framework"] + path = pos-vue-framework + url = git@github.com:gigasource/pos-vue-framework.git + branch = master From fa74058c49c94b89c05f6c3b3dfc4dc311abfef7 Mon Sep 17 00:00:00 2001 From: Lam Phan Dang Date: Mon, 25 Nov 2019 10:11:01 +0700 Subject: [PATCH 03/24] Update .gitmodules --- .gitmodules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1d2b0fe..fa4dd69 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "pos-vue-framework"] - path = pos-vue-framework - url = git@github.com:gigasource/pos-vue-framework.git - branch = master + path = pos-vue-framework + url = git@github.com:gigasource/pos-vue-framework.git + branch = master From 4083a7058acc2d6012338f17170f99e74d435a4d Mon Sep 17 00:00:00 2001 From: Lam Phan Dang Date: Mon, 25 Nov 2019 10:38:57 +0700 Subject: [PATCH 04/24] Update GFieldTableArray.vue Update CSS to look like original gform --- src/form/GFieldTableArray.vue | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/form/GFieldTableArray.vue b/src/form/GFieldTableArray.vue index 806770b..23dbb4b 100644 --- a/src/form/GFieldTableArray.vue +++ b/src/form/GFieldTableArray.vue @@ -64,7 +64,7 @@ }), setup(props, context) { const _model = _modelFactory(props); - const flex = flexFactory(props) + const flex = flexFactory(props); const label = labelFactory(props); return {_model, flex, label, getLabel} @@ -98,8 +98,20 @@ diff --git a/src/form/GFieldObjectArray.vue b/src/form/GFieldObjectArray.vue index 28aacbe..f3b19b2 100644 --- a/src/form/GFieldObjectArray.vue +++ b/src/form/GFieldObjectArray.vue @@ -1,6 +1,6 @@ From 008eec195375ce579778b3a3fb2a304c055eb6dd Mon Sep 17 00:00:00 2001 From: danglam105 Date: Mon, 16 Dec 2019 16:45:32 +0700 Subject: [PATCH 06/24] Update migration code --- src/form/GField.vue | 14 ++++-- src/form/GFieldChoice.vue | 4 +- src/form/GFieldChoiceArray.vue | 2 +- src/form/GFieldObjectArray.vue | 2 +- src/form/GInput.vue | 86 ++++++---------------------------- 5 files changed, 28 insertions(+), 80 deletions(-) diff --git a/src/form/GField.vue b/src/form/GField.vue index 62693b2..a527c56 100644 --- a/src/form/GField.vue +++ b/src/form/GField.vue @@ -1,10 +1,11 @@