center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'dev' into pr@dev_dataset_source

Browse Source
This commit is contained in:
dataeaseShu 2022-09-23 15:00:15 +08:00
commit 269c6334d8
7 changed files with 24 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/resources/i18n/messages_en_US.properties
View File

@ -15,6 +15,8 @@
\u5220\u9664\u89D2\u8272=Delete Role
\u5220\u9664\u8FDE\u63A5=Delete Connection
\u663E\u793A\u8BBE\u7F6E=Display
\u5E73\u53F0\u5BF9\u63A5=Platform Docking
\u8BA4\u8BC1\u8BBE\u7F6E=Authentication Setting
\u7CFB\u7EDF\u53C2\u6570=System Param
\u53C2\u6570\u7BA1\u7406=Parameter
\u6570\u636E\u6E90=Data Source

2
backend/src/main/resources/i18n/messages_zh_CN.properties
View File

@ -15,6 +15,8 @@
\u5220\u9664\u89D2\u8272=\u5220\u9664\u89D2\u8272
\u5220\u9664\u8FDE\u63A5=\u5220\u9664\u8FDE\u63A5
\u663E\u793A\u8BBE\u7F6E=\u663E\u793A\u8BBE\u7F6E
\u5E73\u53F0\u5BF9\u63A5=\u5E73\u53F0\u5BF9\u63A5
\u8BA4\u8BC1\u8BBE\u7F6E=\u8BA4\u8BC1\u8BBE\u7F6E
\u7CFB\u7EDF\u53C2\u6570=\u7CFB\u7EDF\u53C2\u6570
\u53C2\u6570\u7BA1\u7406=\u53C2\u6570\u7BA1\u7406
\u6570\u636E\u6E90=\u6570\u636E\u6E90

2
backend/src/main/resources/i18n/messages_zh_TW.properties
View File

@ -15,6 +15,8 @@
\u5220\u9664\u89D2\u8272=\u522A\u9664\u89D2\u8272
\u522A\u9664\u8FDE\u63A5=\u522A\u9664\u93C8\u63A5
\u663E\u793A\u8BBE\u7F6E=\u986F\u793A\u8A2D\u7F6E
\u5E73\u53F0\u5BF9\u63A5=\u5E73\u81FA\u5C0D\u63A5
\u8BA4\u8BC1\u8BBE\u7F6E=\u8A8D\u8B49\u8A2D\u7F6E
\u7CFB\u7EDF\u53C2\u6570=\u7CFB\u7D71\u53C3\u6578
\u53C2\u6570\u7BA1\u7406=\u53C3\u6578\u7BA1\u7406
\u6570\u636E\u6E90=\u6578\u64DA\u6E90

4
frontend/src/App.vue
View File

@ -1,9 +1,9 @@
<template>
<div id="app">
<keep-alive>
<router-view v-if="['/dataset/index', '/system/system-settings/appearance'].includes(key)"></router-view>
<router-view v-show="['/dataset/index', '/system/system-settings/appearance'].includes(key)"></router-view>
</keep-alive>
<router-view :key="key" v-if="!['/dataset/index', '/system/system-settings/appearance'].includes(key)"></router-view>
<router-view v-show="!['/dataset/index', '/system/system-settings/appearance'].includes(key)"></router-view>
<plugin-com v-show="false" ref="de-theme" component-name="ThemeSetting" />
</div>
</template>

2
frontend/src/components/business/DeLayoutContent.vue
View File

@ -34,7 +34,7 @@ export default {
return backPath || backName || backTo
},
needInnerPadding() {
return ['sys-task-email', 'system-dept', 'system-dept-form', 'system-auth', 'sys-appearance', 'system-param', 'system-template', "sys-task-dataset", "sys-msg-web-all", "system-plugin"].includes(this.$route.name)
return ['sys-identification', 'sys-abutment', 'sys-task-email', 'system-dept', 'system-dept-form', 'system-auth', 'sys-appearance', 'system-param', 'system-template', "sys-task-dataset", "sys-msg-web-all", "system-plugin"].includes(this.$route.name)
}
}
}

45
frontend/src/views/system/SysParam/index.vue
View File

@ -18,20 +18,6 @@
<el-tab-pane :lazy="true" :label="$t('sysParams.map')" name="ten" />
<el-tab-pane
v-if="isPluginLoaded"
:lazy="true"
:label="$t('sysParams.ldap')"
name="fourth"
/>
<el-tab-pane
v-if="isPluginLoaded"
:lazy="true"
:label="$t('sysParams.oidc')"
name="five"
/>
<el-tab-pane
v-if="engineMode === 'simple'"
:lazy="true"
@ -52,31 +38,6 @@
:label="$t('system_parameter_setting.kettle_setting')"
name="eight"
/>
<el-tab-pane
v-if="isPluginLoaded"
:lazy="true"
:label="$t('sysParams.cas')"
name="nine"
/>
<el-tab-pane
v-if="isPluginLoaded"
:lazy="true"
:label="$t('wecom.title')"
name="eleven"
/>
<el-tab-pane
v-if="isPluginLoaded"
:lazy="true"
:label="$t('dingtalk.title')"
name="twelve"
/>
<el-tab-pane
v-if="isPluginLoaded"
:lazy="true"
:label="$t('lark.title')"
name="thirteen"
/>
</el-tabs>
<div
class="tabs-container"
@ -86,15 +47,9 @@
<basic-setting v-if="activeName === 'zero'" :is-plugin-loaded="isPluginLoaded" />
<email-setting v-if="activeName === 'first'" />
<map-setting v-if="activeName === 'ten'" ref="mapSetting" />
<plugin-com v-if="activeName === 'fourth'" ref="DisplaySetting" component-name="LdapSetting" />
<plugin-com v-if="activeName === 'five'" ref="DisplaySetting" component-name="SsoSetting" />
<simple-mode v-if="activeName === 'six'" />
<cluster-mode v-if="activeName === 'seven'" />
<kettle-setting v-if="activeName === 'eight'" />
<plugin-com v-if="activeName === 'nine'" ref="CasSetting" component-name="CasSetting" />
<plugin-com v-if="activeName === 'eleven'" ref="WecomSetting" component-name="WecomSetting" />
<plugin-com v-if="activeName === 'twelve'" ref="DingtalkSetting" component-name="DingtalkSetting" />
<plugin-com v-if="activeName === 'thirteen'" ref="LarkSetting" component-name="LarkSetting" />
</div>
</div>
</div>

24
frontend/src/views/system/plugin/dynamic.vue
View File

@ -25,7 +25,7 @@ import DeLayoutContent from '@/components/business/DeLayoutContent'
import AsyncComponent from '@/components/AsyncComponent'
import i18n from '@/lang'
import bus from '@/utils/bus'
import { execute } from '@/api/system/dynamic'
import { execute, get } from '@/api/system/dynamic'
export default {
name: 'Dynamic',
components: {
@ -56,18 +56,24 @@ export default {
innerLoadingNames: ['SystemDept', 'SystemRole', 'SystemAuth']
}
},
created() {
if (this.jsname && this.menuid) {
this.showAsync = true
this.url = this.baseUrl + this.menuid
// this.url = 'http://localhost:8081/PluginDemo.js'
// this.url = 'http://localhost:8081/SystemParam.js'
} else {
this.showAsync = false
watch: {
'menuid' : function() {
this.init()
}
},
created() {
this.init()
},
methods: {
init() {
if (this.jsname && this.menuid) {
this.showAsync = true
this.url = this.baseUrl + this.menuid
} else {
this.showAsync = false
}
},
// hasLicense
executeAxios(options) {
execute(options).then(res => {