Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
5dd95e4c by fanguang
Options

fix

1 parent d70aeac3
Inline Side-by-side
Showing 8 changed files with 41 additions and 15 deletions
src/components/Dialog/index.vue
......@@ -44,6 +44,7 @@ const emits = defineEmits([
"uploadBtnClick",
"beforeUPload",
"uploadFile",
'deleteFile',
"onUpload",
"scheduleChange",
"cascaderChange",
......@@ -668,7 +669,7 @@ defineExpose({
<template v-else-if="con.type.indexOf('upload') > -1">
<UploadFiles ref="formUploadRef" :upload-info="con.uploadInfo" @onUpload="onUpload"
@beforeUPload="beforeUPload" @uploadFile="uploadFile" @uploadBtnClick="uploadBtnClick"
@cascaderChange="cascaderChange" @selectChange="uploadSelectChange" />
@cascaderChange="cascaderChange" @selectChange="uploadSelectChange" @deleteFile="() => emits('deleteFile')"/>
</template>
<template v-else>
<div v-if="con.formInfo.tools">
......
src/components/EllipsisTooltip.vue
......@@ -70,7 +70,15 @@ const onMouseOver = (str) => {
</script>
<template>
<el-tooltip class="item" placement="top" effect="light" :popper-class="popperClass ?? 'table_tooltip'" :disabled="isShowTooltip" :open-delay="400" :content="content">
<el-tooltip
class="item"
placement="top"
effect="light"
:popper-class="popperClass ?? 'table_tooltip'"
:disabled="isShowTooltip"
:open-delay="400"
:content="content"
>
<p class="over-flow" :class="className" @mouseover="onMouseOver(refName)">
<span :ref="(el) => setRefMap(el, refName)" v-html="content || '-'"></span>
</p>
......@@ -91,4 +99,10 @@ const onMouseOver = (str) => {
p {
margin: 0;
}
</style>
<style lang="scss">
.el-popper.tree-popper {
max-width: 280px!important;
}
</style>
\ No newline at end of file
......
src/components/Tree/index.vue
......@@ -225,7 +225,7 @@ defineExpose({
</span>
<template v-else-if="editTreeItem && data.showEdit !== false">
<span class="list-item-text">
<ellipsis-tooltip v-if="!customInfo" :content="node.label" class-name="w100f"
<ellipsis-tooltip v-if="!customInfo" :content="node.label" class-name="w100f" popper-class="tree-popper"
:refName="'tooltipOver' + node.id"></ellipsis-tooltip>
</span>
<div class="tags-list-right" :class="visibleNodes[node.data.guid] ? 'active' : ''">
......
src/components/Upload/index.vue
......@@ -4,7 +4,7 @@ import { ElMessage, genFileId } from "element-plus";
import { Plus, Download, Upload, } from "@element-plus/icons-vue";
import type { UploadRawFile } from 'element-plus'
const emits = defineEmits(["onUpload", "beforeUPload", "uploadFile", "uploadBtnClick", "cascaderChange", "selectChange"]);
const emits = defineEmits(["onUpload", "beforeUPload", "uploadFile", "uploadBtnClick", "cascaderChange", "selectChange", 'deleteFile']);
const props = defineProps({
uploadInfo: {
type: Object,
......@@ -75,6 +75,7 @@ const btnClick = (file, type) => {
if (type == 'remove') {
const fileUpload = fileUploadRef.value[0] || fileUploadRef.value
fileUpload?.handleRemove(file)
emits('deleteFile')
} else if (type == 'upload') {
file.show = false
emits('uploadFile', file)
......
src/views/data_meta/components/standardDialog.vue
......@@ -25,7 +25,7 @@
</el-col>
<el-col :span="8" style="padding-right:10px">
<el-form-item label="发布单位" prop="publishingUnitCode">
<el-select v-model="form.publishingUnitCode" placeholder="请选择" size="small">
<el-select v-model="form.publishingUnitCode" placeholder="请选择">
<el-option v-for="item in publishUnitOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
</el-select>
</el-form-item>
......@@ -61,27 +61,27 @@
<div class="table-form">
<div class="table-form-wrapper" v-for="item,index in form.fieldRQVOS" :key="index">
<div class="table-form-item">
<el-select v-model="item.fileNameCode" style="width:160px" size="small" clearable>
<el-select v-model="item.fileNameCode" style="width:160px" clearable>
<el-option v-for="item in fieldOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
</el-select>
</div>
<div class="table-form-item">
<el-select v-model="item.isNotnull" style="width: 96px" size="small" placeholder="是否必填" clearable>
<el-select v-model="item.isNotnull" style="width: 96px" placeholder="是否必填" clearable>
<el-option v-for="item in isBooleanOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
</el-select>
</div>
<div class="table-form-item">
<el-select v-model="item.isDisplay" style="width:96px" size="small" placeholder="是否展示" clearable>
<el-select v-model="item.isDisplay" style="width:96px" placeholder="是否展示" clearable>
<el-option v-for="item in isBooleanOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
</el-select>
</div>
<div class="table-form-item">
<el-select v-model="item.inputTypeCode" style="width:130px" size="small" clearable @change="v => inputTypeChange(v, item)">
<el-select v-model="item.inputTypeCode" style="width:130px" clearable @change="v => inputTypeChange(v, item)">
<el-option v-for="item in inputOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
</el-select>
</div>
<div class="table-form-item">
<el-select v-if="item.inputTypeCode == 2" v-model="item.dataTypeCode" style="width:160px" size="small" filterable clearable>
<el-select v-if="item.inputTypeCode == 2" v-model="item.dataTypeCode" style="width:160px" filterable clearable>
<el-option v-for="item in allDictOptions" :label="item.dictTypeName" :value="item.dictTypeName" :key="item.guid"></el-option>
</el-select>
<el-input v-else-if="item.inputTypeCode == 3" v-model="item.validateExpression" placeholder="请输入"></el-input>
......@@ -90,11 +90,11 @@
<!-- <el-icon color="#4fa1a4" @click="() => addTableItem(index)">
<CirclePlus />
</el-icon> -->
<el-icon color="#b2b2b2" @click="() => deleteTableItem(index)"><Delete /></el-icon>
<el-icon color="#b2b2b2" @click="() => deleteTableItem(index)" :size="25"><Delete /></el-icon>
</div>
</div>
<div class="table-form-add">
<el-icon color="#4fa1a4" @click="() => addTableItem(index)">
<el-icon color="#4fa1a4" @click="() => addTableItem(index)" :size="25">
<CirclePlus />
</el-icon>
<span @click="() => addTableItem(index)" style="cursor: pointer;">添加字段</span>
......
src/views/data_meta/standard-import.vue
......@@ -484,6 +484,11 @@ const setUploadInfo = () => {
]
}
function deleteFile () {
sheetNameList.value = []
uploadSetting.value.forEach(item => item.value = null)
}
onActivated(() => {
let list = cacheStore.getCatch('uploadSetting') || []
uploadSetting.value = list.map(item => {
......@@ -515,7 +520,7 @@ onActivated(() => {
@tablePageChange="tablePageChange" />
</div>
<Dialog :dialogInfo="dialogInfo" @btnClick="dialogBtnClick" @onUpload="onUpload" @uploadBtnClick="uploadBtnClick"
@cascaderChange="cascaderChange" @selectChange="selectChange">
@cascaderChange="cascaderChange" @selectChange="selectChange" @deleteFile="deleteFile">
<div style="overflow: auto;">
<div class="title" style="color:#333;margin:20px 0 10px">2、导入前请先导入文件的sheet与标准做对应</div>
<el-table :data="uploadSetting" border height="310">
......
src/views/data_meta/standard-meta-import.vue
......@@ -484,6 +484,11 @@ const setUploadInfo = () => {
]
}
function deleteFile () {
sheetNameList.value = []
uploadSetting.value.forEach(item => item.value = null)
}
onActivated(() => {
let list = cacheStore.getCatch('uploadSetting') || []
uploadSetting.value = list.map(item => {
......@@ -515,7 +520,7 @@ onActivated(() => {
@tablePageChange="tablePageChange" />
</div>
<Dialog :dialogInfo="dialogInfo" @btnClick="dialogBtnClick" @onUpload="onUpload" @uploadBtnClick="uploadBtnClick"
@cascaderChange="cascaderChange" @selectChange="selectChange">
@cascaderChange="cascaderChange" @selectChange="selectChange" @deleteFile="deleteFile">
<div style="overflow: auto;">
<div class="title" style="color:#333;margin:20px 0 10px">2、导入前请先导入文件的sheet与标准做对应</div>
<el-table :data="uploadSetting" border height="310">
......
src/views/data_meta/standard.vue
......@@ -434,7 +434,7 @@ const viewGraph = () => {
<div class="aside_wrap">
<div class="aside_title">
元数据标准列表
<el-icon color="#4fa1a4" @click="openStandardDialog" style="width:2em;height:2em">
<el-icon color="#4fa1a4" @click="openStandardDialog" style="width:2em;height:2em" class="add">
<CirclePlus />
</el-icon>
</div>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!