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

Merge pull request #5346 from dataease/pr@dev_st_fix

Browse Source 
Pr@dev st fix
This commit is contained in:
dataeaseShu 2023-05-29 11:43:44 +08:00 committed by GitHub
commit cba659fa71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/views/dataset/add/AddSQL.vue
View File

@ -164,7 +164,7 @@
@click="typeSwitch(ele)" @click="typeSwitch(ele)"
> >
<span <span
:title="ele.remark" :title="`${ele.name}${ele.remark ? ':' + ele.remark : ''}`"
class="name" class="name"
>{{ ele.name }}</span> >{{ ele.name }}</span>
<i <i
@ -187,7 +187,7 @@
class="table-or-field field" class="table-or-field field"
> >
<span <span
:title="ele.remarks" :title="`${ele.fieldName}${ele.remark ? ':' + ele.remark : ''}`"
class="name" class="name"
>{{ ele.fieldName }}</span> >{{ ele.fieldName }}</span>
<i <i

3
frontend/src/views/system/task/FilterUser.vue
View File

@ -220,7 +220,6 @@ export default {
this.dataRange = [] this.dataRange = []
this.activeDataset = [] this.activeDataset = []
this.selectDatasets = '' this.selectDatasets = ''
this.datasetCache = []
this.selectDatasetsCache = [] this.selectDatasetsCache = []
this.$refs.datasetTreeRef.filter() this.$refs.datasetTreeRef.filter()
this.$emit('search', [], []) this.$emit('search', [], [])
@ -272,7 +271,7 @@ export default {
if (this.activeDataset.length) { if (this.activeDataset.length) {
const str = `${this.$t('dataset.datalist')}:${this.activeDataset.reduce( const str = `${this.$t('dataset.datalist')}:${this.activeDataset.reduce(
(pre, next) => (pre, next) =>
(this.datasetCache.find((ele) => ele.id === next) || {}).name + (this.selectDatasetsCache.find((ele) => ele.id === next) || {}).name +
'、' + '、' +
pre, pre,
'' ''

3
frontend/src/views/system/task/FilterUserRecord.vue
View File

@ -221,7 +221,6 @@ export default {
this.dataRange = [] this.dataRange = []
this.activeDataset = [] this.activeDataset = []
this.selectDatasets = '' this.selectDatasets = ''
this.datasetCache = []
this.selectDatasetsCache = [] this.selectDatasetsCache = []
this.$refs.datasetTreeRef.filter() this.$refs.datasetTreeRef.filter()
this.$emit('search', [], []) this.$emit('search', [], [])
@ -270,7 +269,7 @@ export default {
if (this.activeDataset.length) { if (this.activeDataset.length) {
const str = `${this.$t('dataset.datalist')}:${this.activeDataset.reduce( const str = `${this.$t('dataset.datalist')}:${this.activeDataset.reduce(
(pre, next) => (pre, next) =>
(this.datasetCache.find((ele) => ele.id === next) || {}).name + (this.selectDatasetsCache.find((ele) => ele.id === next) || {}).name +
'、' + '、' +
pre, pre,
'' ''