diff --git a/package.json b/package.json index c9335154..ea7c34ca 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ }, "dependencies": { "@toast-ui/vue-editor": "2.5.1", + "@vue/composition-api": "^1.0.0-rc.8", "axios": "0.21.1", "babel-plugin-require-context-hook": "^1.0.0", "clipboard": "2.0.6", diff --git a/src/components/ADempiere/TitleAndHelp/index.vue b/src/components/ADempiere/TitleAndHelp/index.vue new file mode 100644 index 00000000..d72d2edd --- /dev/null +++ b/src/components/ADempiere/TitleAndHelp/index.vue @@ -0,0 +1,126 @@ + + + + + + + + diff --git a/src/main.js b/src/main.js index 4dd1ac1f..5d34b87c 100644 --- a/src/main.js +++ b/src/main.js @@ -1,4 +1,5 @@ import Vue from 'vue' +import VueCompositionApi from '@vue/composition-api' import Cookies from 'js-cookie' @@ -47,6 +48,7 @@ if (process.env.NODE_ENV === 'production') { const { mockXHR } = require('../mock') mockXHR() } +Vue.use(VueCompositionApi) Vue.use(VMarkdown) Vue.use(VueShortkey) Vue.use(VueSplit) diff --git a/src/styles/ADempiere/view.scss b/src/styles/ADempiere/view.scss index 9c8e73d8..6fbc6288 100644 --- a/src/styles/ADempiere/view.scss +++ b/src/styles/ADempiere/view.scss @@ -26,43 +26,7 @@ height: 100%; } -// title of the main views -.custom-title { - color: #000000; - text-size-adjust: 20px; - font-size: 100%; - font-weight: 605 !important; -} -// title of the main views in mobile -.custom-title-mobile { - text-align: center; - color: #000000; - text-size-adjust: 20px; - font-size: 100%; - font-weight: 605!important; - /* left: 50%; */ -} - -// smart browser help in title popover -.content-help { - width: 100%; - height: 200%; - padding-left: 39px !important; -} -// mobile smart browser help in title popover -.content-help-mobile { - width: 50%; - height: 50%; - padding-left: 15px !important; -} - .content-collapse { padding-left: 20 px !important; padding-top: 50 px !important; } - -// title content -.warn-content { - margin: 0px 0px !important; - padding-top: 0px !important; -} diff --git a/src/views/ADempiere/Browser/index.vue b/src/views/ADempiere/Browser/index.vue index eed5a95e..cb4d807d 100644 --- a/src/views/ADempiere/Browser/index.vue +++ b/src/views/ADempiere/Browser/index.vue @@ -37,27 +37,14 @@ />
- - {{ browserTitle }} - +
- -
- + +
-

- -
- + - {{ formTitle }} - - -

+ + @@ -106,13 +93,15 @@ import ContextMenu from '@/components/ADempiere/ContextMenu' import FormPanel from '@/components/ADempiere/Form' import ModalDialog from '@/components/ADempiere/Dialog' +import TitleAndHelp from '@/components/ADempiere/TitleAndHelp' export default { name: 'FormView', components: { ContextMenu, FormPanel, - ModalDialog + ModalDialog, + TitleAndHelp }, data() { return { @@ -123,15 +112,15 @@ export default { } }, computed: { - formTitle() { + formName() { if (this.$route.meta.title === 'PriceChecking') { return this.$t('route.PriceChecking') } else if (this.$route.meta.title === 'ProductInfo') { return this.$t('route.ProductInfo') } - return this.formMetadata.name || this.$route.meta.title + return this.formMetadata.name }, - fromFileName() { + formFileName() { return this.formMetadata.fileName || this.$route.meta.title }, getterForm() { diff --git a/src/views/ADempiere/Process/index.vue b/src/views/ADempiere/Process/index.vue index 9589655a..276d097a 100644 --- a/src/views/ADempiere/Process/index.vue +++ b/src/views/ADempiere/Process/index.vue @@ -37,25 +37,11 @@ -

- -
- - - {{ processMetadata.name }} - -

+ + diff --git a/src/views/ADempiere/ReportViewer/index.vue b/src/views/ADempiere/ReportViewer/index.vue index 452ed14b..984519b4 100644 --- a/src/views/ADempiere/ReportViewer/index.vue +++ b/src/views/ADempiere/ReportViewer/index.vue @@ -30,25 +30,12 @@
-

- -
- - - {{ reportTitle }} - -

+ +