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

Merge pull request #5418 from dataease/pr@dev_st_fix

Browse Source 
Pr@dev st fix
This commit is contained in:
dataeaseShu 2023-06-06 16:03:35 +08:00 committed by GitHub
commit ed06a61a6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/views/dataset/Form.vue
View File

@ -41,7 +41,7 @@
>{{ $t('deDataset.selected') }} {{ tableNum }} >{{ $t('deDataset.selected') }} {{ tableNum }}
{{ ['excel'].includes(datasetType) ? $t('deDataset.table') : $t('deDataset.item') }}</span> {{ ['excel'].includes(datasetType) ? $t('deDataset.table') : $t('deDataset.item') }}</span>
<deBtn <deBtn
:disabled="['db', 'excel', 'api'].includes(datasetType) && !tableNum" :disabled="['db', 'excel', 'api', 'union'].includes(datasetType) && !tableNum"
type="primary" type="primary"
@click="datasetSave" @click="datasetSave"
>{{ >{{

3
frontend/src/views/dataset/add/AddUnion.vue
View File

@ -305,12 +305,14 @@ export default {
const ds = JSON.parse(JSON.stringify(this.unionItem)) const ds = JSON.parse(JSON.stringify(this.unionItem))
ds.currentDs = this.tempDs ds.currentDs = this.tempDs
this.dataset.push(ds) this.dataset.push(ds)
this.$emit('setTableNum', this.dataset.length)
this.closeSelectDs() this.closeSelectDs()
this.calc('union') this.calc('union')
}, },
deleteNode(index) { deleteNode(index) {
this.dataset.splice(index, 1) this.dataset.splice(index, 1)
this.calc('delete') this.calc('delete')
this.$emit('setTableNum', this.dataset.length)
}, },
calc(param) { calc(param) {
if (param.type === 'union') { if (param.type === 'union') {
@ -385,6 +387,7 @@ export default {
(response) => { (response) => {
const table = JSON.parse(JSON.stringify(response.data)) const table = JSON.parse(JSON.stringify(response.data))
this.dataset = JSON.parse(table.info).union this.dataset = JSON.parse(table.info).union
this.$emit('setTableNum', this.dataset.length)
this.previewData() this.previewData()
} }
) )

13
frontend/src/views/panel/list/PanelViewShow.vue
View File

@ -44,7 +44,7 @@
style="color: green;font-size: 12px" style="color: green;font-size: 12px"
>&nbsp;({{ $t('panel.source_panel_name') }}:{{ panelInfo.sourcePanelName }})</span> >&nbsp;({{ $t('panel.source_panel_name') }}:{{ panelInfo.sourcePanelName }})</span>
</div> </div>
<div style="width: 200px"> <div class="panel-create-cont">
<span <span
v-if="!hasStar && panelInfo && showType !== 1&&panelInfo.status==='publish'" v-if="!hasStar && panelInfo && showType !== 1&&panelInfo.status==='publish'"
style="margin-left: 9px" style="margin-left: 9px"
@ -72,7 +72,7 @@
style="margin: 0 16px;" style="margin: 0 16px;"
direction="vertical" direction="vertical"
/> />
<span class="panel-create"> <span :title="panelInfo.creatorName" class="panel-create">
{{ $t('panel.create_by') + ':' + panelInfo.creatorName }} {{ $t('panel.create_by') + ':' + panelInfo.creatorName }}
</span> </span>
</template> </template>
@ -863,12 +863,21 @@ export default {
} }
.panel-create-cont {
display: flex;
align-items: center;
}
.panel-create { .panel-create {
font-family: PingFang SC; font-family: PingFang SC;
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
line-height: 22px; line-height: 22px;
color: var(--deTextSecondary, #646A73); color: var(--deTextSecondary, #646A73);
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
max-width: 200px;
} }
} }