Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
f3da88e9 by fanguang Committed by lihua
Options

fix

1 parent e6b35bbb
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([ ...@@ -44,6 +44,7 @@ const emits = defineEmits([
44 "uploadBtnClick", 44 "uploadBtnClick",
45 "beforeUPload", 45 "beforeUPload",
46 "uploadFile", 46 "uploadFile",
47 'deleteFile',
47 "onUpload", 48 "onUpload",
48 "scheduleChange", 49 "scheduleChange",
49 "cascaderChange", 50 "cascaderChange",
...@@ -668,7 +669,7 @@ defineExpose({ ...@@ -668,7 +669,7 @@ defineExpose({
668 <template v-else-if="con.type.indexOf('upload') > -1"> 669 <template v-else-if="con.type.indexOf('upload') > -1">
669 <UploadFiles ref="formUploadRef" :upload-info="con.uploadInfo" @onUpload="onUpload" 670 <UploadFiles ref="formUploadRef" :upload-info="con.uploadInfo" @onUpload="onUpload"
670 @beforeUPload="beforeUPload" @uploadFile="uploadFile" @uploadBtnClick="uploadBtnClick" 671 @beforeUPload="beforeUPload" @uploadFile="uploadFile" @uploadBtnClick="uploadBtnClick"
671 @cascaderChange="cascaderChange" @selectChange="uploadSelectChange" /> 672 @cascaderChange="cascaderChange" @selectChange="uploadSelectChange" @deleteFile="() => emits('deleteFile')"/>
672 </template> 673 </template>
673 <template v-else> 674 <template v-else>
674 <div v-if="con.formInfo.tools"> 675 <div v-if="con.formInfo.tools">
......
src/components/EllipsisTooltip.vue
...@@ -70,7 +70,15 @@ const onMouseOver = (str) => { ...@@ -70,7 +70,15 @@ const onMouseOver = (str) => {
70 </script> 70 </script>
71 71
72 <template> 72 <template>
73 <el-tooltip class="item" placement="top" effect="light" :popper-class="popperClass ?? 'table_tooltip'" :disabled="isShowTooltip" :open-delay="400" :content="content"> 73 <el-tooltip
74 class="item"
75 placement="top"
76 effect="light"
77 :popper-class="popperClass ?? 'table_tooltip'"
78 :disabled="isShowTooltip"
79 :open-delay="400"
80 :content="content"
81 >
74 <p class="over-flow" :class="className" @mouseover="onMouseOver(refName)"> 82 <p class="over-flow" :class="className" @mouseover="onMouseOver(refName)">
75 <span :ref="(el) => setRefMap(el, refName)" v-html="content || '-'"></span> 83 <span :ref="(el) => setRefMap(el, refName)" v-html="content || '-'"></span>
76 </p> 84 </p>
...@@ -91,4 +99,10 @@ const onMouseOver = (str) => { ...@@ -91,4 +99,10 @@ const onMouseOver = (str) => {
91 p { 99 p {
92 margin: 0; 100 margin: 0;
93 } 101 }
102 </style>
103
104 <style lang="scss">
105 .el-popper.tree-popper {
106 max-width: 280px!important;
107 }
94 </style> 108 </style>
...\ No newline at end of file ...\ No newline at end of file
......
src/components/Tree/index.vue
...@@ -225,7 +225,7 @@ defineExpose({ ...@@ -225,7 +225,7 @@ defineExpose({
225 </span> 225 </span>
226 <template v-else-if="editTreeItem && data.showEdit !== false"> 226 <template v-else-if="editTreeItem && data.showEdit !== false">
227 <span class="list-item-text"> 227 <span class="list-item-text">
228 <ellipsis-tooltip v-if="!customInfo" :content="node.label" class-name="w100f" 228 <ellipsis-tooltip v-if="!customInfo" :content="node.label" class-name="w100f" popper-class="tree-popper"
229 :refName="'tooltipOver' + node.id"></ellipsis-tooltip> 229 :refName="'tooltipOver' + node.id"></ellipsis-tooltip>
230 </span> 230 </span>
231 <div class="tags-list-right" :class="visibleNodes[node.data.guid] ? 'active' : ''"> 231 <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"; ...@@ -4,7 +4,7 @@ import { ElMessage, genFileId } from "element-plus";
4 import { Plus, Download, Upload, } from "@element-plus/icons-vue"; 4 import { Plus, Download, Upload, } from "@element-plus/icons-vue";
5 import type { UploadRawFile } from 'element-plus' 5 import type { UploadRawFile } from 'element-plus'
6 6
7 const emits = defineEmits(["onUpload", "beforeUPload", "uploadFile", "uploadBtnClick", "cascaderChange", "selectChange"]); 7 const emits = defineEmits(["onUpload", "beforeUPload", "uploadFile", "uploadBtnClick", "cascaderChange", "selectChange", 'deleteFile']);
8 const props = defineProps({ 8 const props = defineProps({
9 uploadInfo: { 9 uploadInfo: {
10 type: Object, 10 type: Object,
...@@ -75,6 +75,7 @@ const btnClick = (file, type) => { ...@@ -75,6 +75,7 @@ const btnClick = (file, type) => {
75 if (type == 'remove') { 75 if (type == 'remove') {
76 const fileUpload = fileUploadRef.value[0] || fileUploadRef.value 76 const fileUpload = fileUploadRef.value[0] || fileUploadRef.value
77 fileUpload?.handleRemove(file) 77 fileUpload?.handleRemove(file)
78 emits('deleteFile')
78 } else if (type == 'upload') { 79 } else if (type == 'upload') {
79 file.show = false 80 file.show = false
80 emits('uploadFile', file) 81 emits('uploadFile', file)
......
src/views/data_meta/components/standardDialog.vue
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 </el-col> 25 </el-col>
26 <el-col :span="8" style="padding-right:10px"> 26 <el-col :span="8" style="padding-right:10px">
27 <el-form-item label="发布单位" prop="publishingUnitCode"> 27 <el-form-item label="发布单位" prop="publishingUnitCode">
28 <el-select v-model="form.publishingUnitCode" placeholder="请选择" size="small"> 28 <el-select v-model="form.publishingUnitCode" placeholder="请选择">
29 <el-option v-for="item in publishUnitOptions" :label="item.label" :value="item.value" :key="item.value"></el-option> 29 <el-option v-for="item in publishUnitOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
30 </el-select> 30 </el-select>
31 </el-form-item> 31 </el-form-item>
...@@ -61,27 +61,27 @@ ...@@ -61,27 +61,27 @@
61 <div class="table-form"> 61 <div class="table-form">
62 <div class="table-form-wrapper" v-for="item,index in form.fieldRQVOS" :key="index"> 62 <div class="table-form-wrapper" v-for="item,index in form.fieldRQVOS" :key="index">
63 <div class="table-form-item"> 63 <div class="table-form-item">
64 <el-select v-model="item.fileNameCode" style="width:160px" size="small" clearable> 64 <el-select v-model="item.fileNameCode" style="width:160px" clearable>
65 <el-option v-for="item in fieldOptions" :label="item.label" :value="item.value" :key="item.value"></el-option> 65 <el-option v-for="item in fieldOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
66 </el-select> 66 </el-select>
67 </div> 67 </div>
68 <div class="table-form-item"> 68 <div class="table-form-item">
69 <el-select v-model="item.isNotnull" style="width: 96px" size="small" placeholder="是否必填" clearable> 69 <el-select v-model="item.isNotnull" style="width: 96px" placeholder="是否必填" clearable>
70 <el-option v-for="item in isBooleanOptions" :label="item.label" :value="item.value" :key="item.value"></el-option> 70 <el-option v-for="item in isBooleanOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
71 </el-select> 71 </el-select>
72 </div> 72 </div>
73 <div class="table-form-item"> 73 <div class="table-form-item">
74 <el-select v-model="item.isDisplay" style="width:96px" size="small" placeholder="是否展示" clearable> 74 <el-select v-model="item.isDisplay" style="width:96px" placeholder="是否展示" clearable>
75 <el-option v-for="item in isBooleanOptions" :label="item.label" :value="item.value" :key="item.value"></el-option> 75 <el-option v-for="item in isBooleanOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
76 </el-select> 76 </el-select>
77 </div> 77 </div>
78 <div class="table-form-item"> 78 <div class="table-form-item">
79 <el-select v-model="item.inputTypeCode" style="width:130px" size="small" clearable @change="v => inputTypeChange(v, item)"> 79 <el-select v-model="item.inputTypeCode" style="width:130px" clearable @change="v => inputTypeChange(v, item)">
80 <el-option v-for="item in inputOptions" :label="item.label" :value="item.value" :key="item.value"></el-option> 80 <el-option v-for="item in inputOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
81 </el-select> 81 </el-select>
82 </div> 82 </div>
83 <div class="table-form-item"> 83 <div class="table-form-item">
84 <el-select v-if="item.inputTypeCode == 2" v-model="item.dataTypeCode" style="width:160px" size="small" filterable clearable> 84 <el-select v-if="item.inputTypeCode == 2" v-model="item.dataTypeCode" style="width:160px" filterable clearable>
85 <el-option v-for="item in allDictOptions" :label="item.dictTypeName" :value="item.dictTypeName" :key="item.guid"></el-option> 85 <el-option v-for="item in allDictOptions" :label="item.dictTypeName" :value="item.dictTypeName" :key="item.guid"></el-option>
86 </el-select> 86 </el-select>
87 <el-input v-else-if="item.inputTypeCode == 3" v-model="item.validateExpression" placeholder="请输入"></el-input> 87 <el-input v-else-if="item.inputTypeCode == 3" v-model="item.validateExpression" placeholder="请输入"></el-input>
...@@ -90,11 +90,11 @@ ...@@ -90,11 +90,11 @@
90 <!-- <el-icon color="#4fa1a4" @click="() => addTableItem(index)"> 90 <!-- <el-icon color="#4fa1a4" @click="() => addTableItem(index)">
91 <CirclePlus /> 91 <CirclePlus />
92 </el-icon> --> 92 </el-icon> -->
93 <el-icon color="#b2b2b2" @click="() => deleteTableItem(index)"><Delete /></el-icon> 93 <el-icon color="#b2b2b2" @click="() => deleteTableItem(index)" :size="25"><Delete /></el-icon>
94 </div> 94 </div>
95 </div> 95 </div>
96 <div class="table-form-add"> 96 <div class="table-form-add">
97 <el-icon color="#4fa1a4" @click="() => addTableItem(index)"> 97 <el-icon color="#4fa1a4" @click="() => addTableItem(index)" :size="25">
98 <CirclePlus /> 98 <CirclePlus />
99 </el-icon> 99 </el-icon>
100 <span @click="() => addTableItem(index)" style="cursor: pointer;">添加字段</span> 100 <span @click="() => addTableItem(index)" style="cursor: pointer;">添加字段</span>
......
src/views/data_meta/standard-import.vue
...@@ -484,6 +484,11 @@ const setUploadInfo = () => { ...@@ -484,6 +484,11 @@ const setUploadInfo = () => {
484 ] 484 ]
485 } 485 }
486 486
487 function deleteFile () {
488 sheetNameList.value = []
489 uploadSetting.value.forEach(item => item.value = null)
490 }
491
487 onActivated(() => { 492 onActivated(() => {
488 let list = cacheStore.getCatch('uploadSetting') || [] 493 let list = cacheStore.getCatch('uploadSetting') || []
489 uploadSetting.value = list.map(item => { 494 uploadSetting.value = list.map(item => {
...@@ -515,7 +520,7 @@ onActivated(() => { ...@@ -515,7 +520,7 @@ onActivated(() => {
515 @tablePageChange="tablePageChange" /> 520 @tablePageChange="tablePageChange" />
516 </div> 521 </div>
517 <Dialog :dialogInfo="dialogInfo" @btnClick="dialogBtnClick" @onUpload="onUpload" @uploadBtnClick="uploadBtnClick" 522 <Dialog :dialogInfo="dialogInfo" @btnClick="dialogBtnClick" @onUpload="onUpload" @uploadBtnClick="uploadBtnClick"
518 @cascaderChange="cascaderChange" @selectChange="selectChange"> 523 @cascaderChange="cascaderChange" @selectChange="selectChange" @deleteFile="deleteFile">
519 <div style="overflow: auto;"> 524 <div style="overflow: auto;">
520 <div class="title" style="color:#333;margin:20px 0 10px">2、导入前请先导入文件的sheet与标准做对应</div> 525 <div class="title" style="color:#333;margin:20px 0 10px">2、导入前请先导入文件的sheet与标准做对应</div>
521 <el-table :data="uploadSetting" border height="310"> 526 <el-table :data="uploadSetting" border height="310">
......
src/views/data_meta/standard-meta-import.vue
...@@ -484,6 +484,11 @@ const setUploadInfo = () => { ...@@ -484,6 +484,11 @@ const setUploadInfo = () => {
484 ] 484 ]
485 } 485 }
486 486
487 function deleteFile () {
488 sheetNameList.value = []
489 uploadSetting.value.forEach(item => item.value = null)
490 }
491
487 onActivated(() => { 492 onActivated(() => {
488 let list = cacheStore.getCatch('uploadSetting') || [] 493 let list = cacheStore.getCatch('uploadSetting') || []
489 uploadSetting.value = list.map(item => { 494 uploadSetting.value = list.map(item => {
...@@ -515,7 +520,7 @@ onActivated(() => { ...@@ -515,7 +520,7 @@ onActivated(() => {
515 @tablePageChange="tablePageChange" /> 520 @tablePageChange="tablePageChange" />
516 </div> 521 </div>
517 <Dialog :dialogInfo="dialogInfo" @btnClick="dialogBtnClick" @onUpload="onUpload" @uploadBtnClick="uploadBtnClick" 522 <Dialog :dialogInfo="dialogInfo" @btnClick="dialogBtnClick" @onUpload="onUpload" @uploadBtnClick="uploadBtnClick"
518 @cascaderChange="cascaderChange" @selectChange="selectChange"> 523 @cascaderChange="cascaderChange" @selectChange="selectChange" @deleteFile="deleteFile">
519 <div style="overflow: auto;"> 524 <div style="overflow: auto;">
520 <div class="title" style="color:#333;margin:20px 0 10px">2、导入前请先导入文件的sheet与标准做对应</div> 525 <div class="title" style="color:#333;margin:20px 0 10px">2、导入前请先导入文件的sheet与标准做对应</div>
521 <el-table :data="uploadSetting" border height="310"> 526 <el-table :data="uploadSetting" border height="310">
......
src/views/data_meta/standard.vue
...@@ -434,7 +434,7 @@ const viewGraph = () => { ...@@ -434,7 +434,7 @@ const viewGraph = () => {
434 <div class="aside_wrap"> 434 <div class="aside_wrap">
435 <div class="aside_title"> 435 <div class="aside_title">
436 元数据标准列表 436 元数据标准列表
437 <el-icon color="#4fa1a4" @click="openStandardDialog" style="width:2em;height:2em"> 437 <el-icon color="#4fa1a4" @click="openStandardDialog" style="width:2em;height:2em" class="add">
438 <CirclePlus /> 438 <CirclePlus />
439 </el-icon> 439 </el-icon>
440 </div> 440 </div>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!