dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2740 from dataease/dev

Browse Source 
dev merge
This commit is contained in:
王嘉豪 2022-07-29 18:16:01 +08:00 committed by GitHub
commit 4361dc1f76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/package.json
View File

@ -22,11 +22,9 @@
"@tinymce/tinymce-vue": "^3.2.8", "@tinymce/tinymce-vue": "^3.2.8",
"axios": "^0.21.1", "axios": "^0.21.1",
"core-js": "^2.6.5", "core-js": "^2.6.5",
"css-color-function": "^1.3.3",
"echarts": "^5.0.1", "echarts": "^5.0.1",
"element-resize-detector": "^1.2.3", "element-resize-detector": "^1.2.3",
"element-ui": "2.15.7", "element-ui": "2.15.7",
"file-save": "^0.2.0",
"file-saver": "^2.0.5", "file-saver": "^2.0.5",
"fit2cloud-ui": "^1.8.0", "fit2cloud-ui": "^1.8.0",
"flv.js": "^1.6.2", "flv.js": "^1.6.2",
@ -54,7 +52,6 @@
"tinymce": "^5.8.2", "tinymce": "^5.8.2",
"umy-ui": "^1.1.6", "umy-ui": "^1.1.6",
"vcolorpicker": "^1.1.0", "vcolorpicker": "^1.1.0",
"videojs-flash": "^2.2.1",
"vue": "2.6.10", "vue": "2.6.10",
"vue-axios": "3.2.4", "vue-axios": "3.2.4",
"vue-clipboard2": "0.3.1", "vue-clipboard2": "0.3.1",
@ -90,8 +87,6 @@
"eslint": "5.15.3", "eslint": "5.15.3",
"eslint-plugin-vue": "5.2.2", "eslint-plugin-vue": "5.2.2",
"html-webpack-plugin": "3.2.0", "html-webpack-plugin": "3.2.0",
"less": "^3.0.0",
"less-loader": "^5.0.0",
"mockjs": "1.0.1-beta3", "mockjs": "1.0.1-beta3",
"runjs": "^4.1.3", "runjs": "^4.1.3",
"sass": "^1.33.0", "sass": "^1.33.0",

2
frontend/src/layout/components/Sidebar/index.vue
View File

@ -49,7 +49,7 @@ export default {
// return this.$router.options.routes // return this.$router.options.routes
if (this.isCollapse) { if (this.isCollapse) {
return this.flatterRouter( return this.flatterRouter(
this.$store.state.permission.currentRoutes.children JSON.parse(JSON.stringify(this.$store.state.permission.currentRoutes.children))
); );
} }
return this.$store.state.permission.currentRoutes.children; return this.$store.state.permission.currentRoutes.children;

13
frontend/src/views/panel/template/index.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<de-container> <de-container class="content-container">
<de-aside-container isTemplate> <de-aside-container class="template-aside-container" is-template>
<el-tabs v-model="currentTemplateType" @tab-click="handleClick"> <el-tabs v-model="currentTemplateType" @tab-click="handleClick">
<el-tab-pane name="self"> <el-tab-pane name="self">
<span slot="label"><i class="el-icon-star-off tablepanel-i" />{{ $t('panel.user_template') }}</span> <span slot="label"><i class="el-icon-star-off tablepanel-i" />{{ $t('panel.user_template') }}</span>
@ -211,4 +211,13 @@ export default {
height: 100%; height: 100%;
} }
.content-container{
padding: 20px!important;
overflow: hidden;
height: calc(100vh - 56px)!important;
}
.template-aside-container{
height: calc(100vh - 96px)!important;
}
</style> </style>

6
frontend/src/views/system/datasource/DsConfiguration.vue
View File

@ -1039,7 +1039,9 @@ export default {
for (var j = 0; j < this.apiItem.fields.length; j++) { for (var j = 0; j < this.apiItem.fields.length; j++) {
if(this.apiItem.fields[j].name === jsonFields[i].name){ if(this.apiItem.fields[j].name === jsonFields[i].name){
jsonFields[i].checked = false; this.$nextTick(() => {
jsonFields[i].checked = false;
})
this.$message.error(jsonFields[i].name + ', ' + i18n.t('datasource.has_repeat_field_name')) this.$message.error(jsonFields[i].name + ', ' + i18n.t('datasource.has_repeat_field_name'))
return return
} }
@ -1200,7 +1202,7 @@ export default {
background-color: rgba(187, 191, 196, 0.5); background-color: rgba(187, 191, 196, 0.5);
height: 1px; height: 1px;
top: 13px; top: 13px;
left: calc(50% + 22px); left: calc(50% + 22px) !important;
width: 100px; width: 100px;
margin-right: 0px; margin-right: 0px;