Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
0d4606a5 by lihua
Options

fix: 修复bug

1 parent a625259f
Inline Side-by-side
Showing 3 changed files with 63 additions and 47 deletions
src/components/Form/index.vue
......@@ -1135,14 +1135,14 @@ const panelChange = (scope, row) => {
<p class="label_tips">{{ setLabelTips(formInline[child.field], child) }}</p>
</template>
</div>
<el-radio-group :class="[item.col, { is_block: item.block }]" v-else-if="item.type == 'radio-group'"
<el-radio-group :class="[item.col, { is_block: item.block }]" v-else-if="item.type == 'radio-group-input'"
v-model="formInline[item.field]" @change="(val) => radioGroupChange(val, item)">
<el-radio v-for="(radio, index) in item.options" :label="radio.value">
<template #default>
<span :style="{ 'line-height': '32px' }">{{ radio.label }}</span>
<span
:style="{ display: 'inline-flex', width: (index == (item.inputOptions?.index ?? (item.options.length - 1)) && item.inputOptions) ? (item.inputOptions.width ?? '230px') : '0px' }">
<el-form-item
<el-form-item @click.stop.prevent
v-if="index == (item.inputOptions?.index ?? (item.options.length - 1)) && (item.inputOptions?.visible ?? false)"
:prop="item.inputOptions?.field" :class="[item.inputOptions?.col]">
<el-select v-if="item.inputOptions?.type == 'select'" v-model="formInline[item.inputOptions?.field]"
......@@ -1162,7 +1162,7 @@ const panelChange = (scope, row) => {
type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
:placeholder="item.inputOptions?.placeholder"
:disabled-date="item.inputOptions?.disabledDate ?? ((time) => { return false; })" />
<el-input v-else-if="item.inputOptions?.type == 'input'"
<el-input v-else-if="item.inputOptions?.type == 'input'" @click.stop.prevent
v-model.trim="formInline[item.inputOptions?.field]" :placeholder="item.inputOptions?.placeholder"
:disabled="item.inputOptions?.disabled || readonly" :clearable="item.inputOptions?.clearable"
:maxlength="item.inputOptions?.maxlength ?? ''" />
......
src/views/data_asset/registerJSZQDetail.vue
......@@ -499,7 +499,7 @@ const isTextTruncated = () => {
if (!domDesc) {
return;
}
if (domDesc.clientHeight > (90 + 25)) {
if (domDesc.clientHeight > (90 + 25)) {
isTruncated.value = true;
} else {
isTruncated.value = false;
......@@ -1300,8 +1300,9 @@ const passCommonDialogBtnClick = (btn, info) => {
<div class="left-img"></div>
<div class="right-main">
<div class="asset-title">
<div style="display: flex;align-items: center;">
<div class="title1">{{ assetDetailInfo.productName ?? '--' }}</div>
<div style="display: flex;align-items: center;width: 100%;">
<div class="title1"><ellipsis-tooltip :content="assetDetailInfo.productName || '--'"
class-name="w100f" :refName="'tooltipOver' + 'productName'"></ellipsis-tooltip></div>
<!-- <div v-if="assetDetailInfo.dataSensitivityLevelName?.length" class="dataLabel">{{
(assetDetailInfo.dataSensitivityLevelName?.filter(u => u != '其他')?.join('、') +
`${assetDetailInfo.dataSensitivityLevelOther || ''}`)
......@@ -1324,8 +1325,10 @@ const passCommonDialogBtnClick = (btn, info) => {
</div>
</div>
</div>
<div class="label-main" v-if="assetDetailInfo.productKeywords?.length">
<div class="key-label" v-for="(item, index) in assetDetailInfo.productKeywords || []" :style="{ 'margin-left': index > 0 ? '4px' : '0px' }">{{ item }}</div>
<div class="label-main" v-if="assetDetailInfo.productKeywords?.length">
<div class="key-label" v-for="(item, index) in assetDetailInfo.productKeywords || []"
:style="{ 'max-width': '250px' }"><ellipsis-tooltip :content="item"
class-name="w100f" :refName="'tooltipOver' + 'word' + index"></ellipsis-tooltip></div>
</div>
<div class="applicationScenarios"
:style="{ 'margin-right': (isTruncated && !isExpanded) ? '30px' : '0px', WebkitLineClamp: (!isTruncated ? 'inherit' : (isExpanded ? 'inherit' : 2)), WebkitBoxOrient: 'vertical' }">
......@@ -1364,7 +1367,8 @@ const passCommonDialogBtnClick = (btn, info) => {
</div>
<div class="list_item">
<span class="item_label">应用场景:</span>
<span class="item_value">{{ assetDetailInfo.scenarioName || '--' }}</span>
<span class="item_value"><ellipsis-tooltip :content="assetDetailInfo.scenarioName || '--'"
class-name="w100f mr8-i" :refName="'tooltipOver' + 'scenarioName'"></ellipsis-tooltip></span>
</div>
<div class="list_item" v-show="assetDetailInfo.domain == '003'">
<span class="item_label">所属科室:</span>
......@@ -1402,7 +1406,8 @@ const passCommonDialogBtnClick = (btn, info) => {
</div>
<div class="list_item">
<span class="item_label">版本名称:</span>
<span class="item_value">{{ assetDetailInfo.versionName || '--' }}</span>
<span class="item_value"><ellipsis-tooltip :content="assetDetailInfo.versionName || '--'"
class-name="w100f mr8-i" :refName="'tooltipOver' + 'versionName'"></ellipsis-tooltip></span>
</div>
<!-- <div class="list_item">
<span class="item_label">产品关键词:</span>
......@@ -1437,9 +1442,10 @@ const passCommonDialogBtnClick = (btn, info) => {
</div>
<div class="list_item">
<span class="item_label">数据产品和服务类型:</span>
<span class="item_value">{{ assetDetailInfo.registerRSVO.dataProductsAndServicesType == '6' ?
<span class="item_value"><ellipsis-tooltip :content="assetDetailInfo.registerRSVO.dataProductsAndServicesType == '6' ?
assetDetailInfo.registerRSVO.dataProductsAndServicesOtherType :
assetDetailInfo.registerRSVO.dataProductsAndServicesTypeName }}</span>
assetDetailInfo.registerRSVO.dataProductsAndServicesTypeName" class-name="w100f mr8-i"
:refName="'tooltipOver' + 'dataProductsAndServicesTypeName'"></ellipsis-tooltip></span>
</div>
<div class="list_item">
<span class="item_label">行业分类:</span>
......@@ -1464,27 +1470,31 @@ const passCommonDialogBtnClick = (btn, info) => {
</div>
<div class="list_item">
<span class="item_label">数据生产方式:</span>
<span class="item_value">{{ assetDetailInfo.registerRSVO.productionMethod == '6' ?
<span class="item_value"><ellipsis-tooltip :content="assetDetailInfo.registerRSVO.productionMethodName == '其他' ?
assetDetailInfo.registerRSVO.productionOtherMethod :
assetDetailInfo.registerRSVO.productionMethodName }}</span>
assetDetailInfo.registerRSVO.productionMethodName" class-name="w100f mr8-i"
:refName="'tooltipOver' + 'productionMethodName'"></ellipsis-tooltip></span>
</div>
<div class="list_item">
<span class="item_label">数据结构:</span>
<span class="item_value">{{ assetDetailInfo.registerRSVO.dataStructure == '4' ?
<span class="item_value"><ellipsis-tooltip :content="assetDetailInfo.registerRSVO.dataStructure == '4' ?
assetDetailInfo.registerRSVO.dataOtherStructure :
assetDetailInfo.registerRSVO.dataStructureName }}</span>
assetDetailInfo.registerRSVO.dataStructureName" class-name="w100f mr8-i"
:refName="'tooltipOver' + 'dataStructureName'"></ellipsis-tooltip></span>
</div>
<div class="list_item">
<span class="item_label">数据提供格式:</span>
<span class="item_value">{{ assetDetailInfo.registerRSVO.dataProvisionFormat == '5' ?
<span class="item_value"><ellipsis-tooltip :content="assetDetailInfo.registerRSVO.dataProvisionFormat == '5' ?
assetDetailInfo.registerRSVO.dataProvisionOtherFormat :
assetDetailInfo.registerRSVO.dataProvisionFormatName }}</span>
assetDetailInfo.registerRSVO.dataProvisionFormatName" class-name="w100f mr8-i"
:refName="'tooltipOver' + 'dataProvisionFormatName'"></ellipsis-tooltip></span>
</div>
<div class="list_item">
<span class="item_label">存储方式:</span>
<span class="item_value">{{ assetDetailInfo.registerRSVO.storageMethod == '7' ?
<span class="item_value"><ellipsis-tooltip :content="assetDetailInfo.registerRSVO.storageMethod == '7' ?
assetDetailInfo.registerRSVO.storageOtherMethod :
assetDetailInfo.registerRSVO.storageMethodName }}</span>
assetDetailInfo.registerRSVO.storageMethodName" class-name="w100f mr8-i"
:refName="'tooltipOver' + 'storageMethodName'"></ellipsis-tooltip></span>
</div>
<div class="list_item">
<span class="item_label">数据更新方式:</span>
......@@ -1521,9 +1531,10 @@ const passCommonDialogBtnClick = (btn, info) => {
<div class="list_item"
v-show="assetDetailInfo.registerRSVO.sensitiveInformation == 'Y' && assetDetailInfo.registerRSVO.desensitizationSituation == 'Y'">
<span class="item_label">脱敏方式:</span>
<span class="item_value">{{ assetDetailInfo.registerRSVO.desensitizationMethod == '7' ?
<span class="item_value"><ellipsis-tooltip :content="assetDetailInfo.registerRSVO.desensitizationMethod == '7' ?
assetDetailInfo.registerRSVO.desensitizationOtherMethod :
assetDetailInfo.registerRSVO.desensitizationMethodName }}</span>
assetDetailInfo.registerRSVO.desensitizationMethodName" class-name="w100f mr8-i"
:refName="'tooltipOver' + 'desensitizationMethodName'"></ellipsis-tooltip></span>
</div>
<div class="list_item">
<span class="item_label">存证方式:</span>
......@@ -1546,9 +1557,9 @@ const passCommonDialogBtnClick = (btn, info) => {
</div>
<div class="list_item" v-show="assetDetailInfo.registerRSVO.sharingType != '3'">
<span class="item_label">共享方式:</span>
<span class="item_value">{{ assetDetailInfo.registerRSVO.sharingMethod == '5' ?
assetDetailInfo.registerRSVO.sharingOtherMethod : assetDetailInfo.registerRSVO.sharingMethodName
}}</span>
<span class="item_value"><ellipsis-tooltip :content="assetDetailInfo.registerRSVO.sharingMethod == '5' ?
assetDetailInfo.registerRSVO.sharingOtherMethod : assetDetailInfo.registerRSVO.sharingMethodName"
class-name="w100f mr8-i" :refName="'tooltipOver' + 'sharingMethodName'"></ellipsis-tooltip></span>
</div>
<div class="list_item">
<span class="item_label">是否向社会开放:</span>
......@@ -2292,6 +2303,7 @@ const passCommonDialogBtnClick = (btn, info) => {
justify-content: space-between;
.title1 {
max-width: calc(100% - 100px);
font-size: 20px;
color: #212121;
letter-spacing: 0;
......@@ -2332,21 +2344,23 @@ const passCommonDialogBtnClick = (btn, info) => {
}
}
.label-main {
display: flex;
margin-top: 4px;
flex-wrap: wrap;
gap: 4px;
.key-label {
background: #F2F2F2;
border-radius: 2px;
font-size: 12px;
color: #666;
text-align: center;
line-height: 21px;
font-weight: 400;
padding: 0 8px;
}
.key-label {
background: #F2F2F2;
border-radius: 2px;
font-size: 12px;
color: #666;
text-align: center;
line-height: 21px;
font-weight: 400;
padding: 0 8px;
}
}
.applicationScenarios {
......@@ -2364,7 +2378,7 @@ const passCommonDialogBtnClick = (btn, info) => {
.expand_btn {
position: absolute;
right: 0px;
top: 60px;
bottom: 0px;
font-size: 14px;
line-height: 21px;
}
......
src/views/data_asset/registerStartJS.vue
......@@ -477,6 +477,8 @@ const handleProductBaseFormSelectChange = (val, row, info) => {
} else {
proxy.$ElMessage.error(res.msg);
}
}).catch(err => {
fullscreenLoading.value = false;
})
}, () => {
info.productName = oldProductName.value;
......@@ -1385,7 +1387,7 @@ const productRegisterInfoItems = ref([{
},
{
label: "是否向社会开放",
type: "radio-group",
type: "radio-group-input",
placeholder: "",
field: "isSocialOpenness",
col: 'other-group-flex',
......@@ -1971,9 +1973,9 @@ onBeforeMount(async () => {
// }];
return {
label: d.label,
tip: '支持扩展名：pdf、png、jpg、gif、rar、zip，单个文件不得大于10M',
tip: '支持扩展名：pdf、png、jpg、rar、zip，单个文件不得大于10M',
type: 'upload-file',
accept: '.pdf, .png, .jpg, .gif, .rar, .zip',
accept: '.pdf, .png, .jpg, .rar, .zip',
required: false,
limitSize: 10,
default: [],
......@@ -2069,16 +2071,16 @@ onBeforeMount(async () => {
})
})
nextTick(() => {
setTimeout(() => {
setTimeout(() => {
formRef.value?.ruleFormRef?.clearValidate();
}, 50)
})
} else {
proxy.$ElMessage.error(res.msg);
}
}).catch(err => {
fullscreenLoading.value = false;
})
}).catch(() => {
fullscreenLoading.value = false;
})
} else {
getRegisterCatalogListData();
......@@ -2170,8 +2172,8 @@ const saveDraft = () => {
}, {
reqParamListRQVOS: inputParamsData.value,
respParamListRQVOS: respParamsData.value,
resourcesRQVOS: authSourceData.value,
organizationRQVOS: orgData.value
resourcesRQVOS: registerInfoValue.isAuthreSourceDevelop == 'Y' ? authSourceData.value : [],
organizationRQVOS: registerInfoValue.isSharedData == 'Y' ? orgData.value : []
}, {
registerRQVO: {
...registerInfoValue,
......@@ -2369,8 +2371,8 @@ const save = () => {
}, {
reqParamListRQVOS: inputParamsData.value,
respParamListRQVOS: respParamsData.value,
resourcesRQVOS: authSourceData.value,
organizationRQVOS: orgData.value
resourcesRQVOS: registerInfoValue.isAuthreSourceDevelop == 'Y' ? authSourceData.value : [],
organizationRQVOS: registerInfoValue.isSharedData == 'Y' ? orgData.value : []
}, {
registerRQVO: {
...registerInfoValue,
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!