diff --git a/package.json b/package.json index 34a1023..2424c5b 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "test:ci": "npm run lint && npm run test:unit" }, "dependencies": { + "@riophae/vue-treeselect": "^0.4.0", "axios": "0.18.1", "core-js": "3.6.5", "element-ui": "2.13.2", diff --git a/src/layout/index.vue b/src/layout/index.vue index fba4f0f..d71d7d2 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -45,9 +45,15 @@ export default { } }, methods: { + toggleSideBar() { + this.$store.dispatch('app/toggleSideBar') + }, handleClickOutside() { this.$store.dispatch('app/closeSideBar', { withoutAnimation: false }) } + }, + created() { + window.toggleSideBar = this.toggleSideBar } } diff --git a/src/main.js b/src/main.js index 16bfd61..29acece 100644 --- a/src/main.js +++ b/src/main.js @@ -56,6 +56,11 @@ Vue.use(Vant) import domZIndex from 'dom-zindex' domZIndex.setCurrent(2000) +// treeselect +import '@riophae/vue-treeselect/dist/vue-treeselect.css' +import Treeselect from '@riophae/vue-treeselect' +Vue.component('Treeselect', Treeselect) + import CardContainer from '@/layout/CardContainer.vue' Vue.component('CardContainer', CardContainer) //moment diff --git a/src/styles/index.scss b/src/styles/index.scss index afeb6bc..b0abfbd 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -67,3 +67,14 @@ p { // main-container global css .main-container { } + +.vue-treeselect__multi-value-item,.vue-treeselect__value-remove { + color: var(--theme-color) !important; +} +.vue-treeselect__checkbox--checked { + background-color: var(--theme-color) !important; + border-color: var(--theme-color) !important; +} +.vxe-loading--default-icon,.vxe-loading--text { + color: var(--theme-color) !important;; +} diff --git a/src/utils/formBuilder.js b/src/utils/formBuilder.js index ca34fb3..6946693 100644 --- a/src/utils/formBuilder.js +++ b/src/utils/formBuilder.js @@ -762,8 +762,8 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab style: { "grid-column-start": info.gs_x + 1, "grid-column-end": info.gs_x + 1 + info.gs_width, - "grid-row-start": info.gs_y + 1, - "grid-row-end": info.gs_y + 1 + info.gs_height, + "grid-row-start": info.gs_y + 1 + (info.name === 'flow_title' ? 0 : 1), + "grid-row-end": info.gs_y + 1 + (info.name === 'flow_title' ? 0 : 1) + info.gs_height, }, }, [formItem] diff --git a/src/views/DocumentMenu/components/AddDocumentMenu.vue b/src/views/DocumentMenu/components/AddDocumentMenu.vue new file mode 100644 index 0000000..ac97c42 --- /dev/null +++ b/src/views/DocumentMenu/components/AddDocumentMenu.vue @@ -0,0 +1,139 @@ + + + + + diff --git a/src/views/DocumentMenu/index.vue b/src/views/DocumentMenu/index.vue new file mode 100644 index 0000000..dec9943 --- /dev/null +++ b/src/views/DocumentMenu/index.vue @@ -0,0 +1,203 @@ + + + + + diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index dd312da..b9fc036 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -325,6 +325,15 @@ export default { computed: { ...mapGetters(["name"]), }, + watch: { + isShowModal(newVal) { + if(newVal) { + this.zIndex = PopupManager.nextZIndex() + } else { + this.modalUrl = '' + } + } + }, methods: { getTodayAttendance(date) { return this.attendanceData.attendances.find((i) => i.date === date) diff --git a/src/views/document/components/AddDocument.vue b/src/views/document/components/AddDocument.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/document/index.vue b/src/views/document/index.vue new file mode 100644 index 0000000..252cdf8 --- /dev/null +++ b/src/views/document/index.vue @@ -0,0 +1,121 @@ + + + + + diff --git a/src/views/flow/DesktopForm.vue b/src/views/flow/DesktopForm.vue index faea2e7..0e86c89 100644 --- a/src/views/flow/DesktopForm.vue +++ b/src/views/flow/DesktopForm.vue @@ -1,8 +1,13 @@