Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
c987b33d by lihua
Options

数据产品目录修改

1 parent ca58d6b4
Inline Side-by-side
Showing 3 changed files with 107 additions and 73 deletions
src/views/data_asset/registerCatalogCreate.vue
...@@ -987,7 +987,7 @@ const save = () => { ...@@ -987,7 +987,7 @@ const save = () => {
987 } 987 }
988 params.associationApi = associationApiList; 988 params.associationApi = associationApiList;
989 /** 只有数据集和api类型时，目录表必填。 */ 989 /** 只有数据集和api类型时，目录表必填。 */
990 if ((params.damType == '1' || params.damType == '2') && route.query.foundMode != '2') { 990 if ((params.damType == '1') && route.query.foundMode != '2') {
991 if (!params.databaseType) { 991 if (!params.databaseType) {
992 proxy.$ElMessage.error('资源类型为数据集时，数据库类型必填'); 992 proxy.$ElMessage.error('资源类型为数据集时，数据库类型必填');
993 baseInfoExpand.value = true; 993 baseInfoExpand.value = true;
...@@ -1004,6 +1004,12 @@ const save = () => { ...@@ -1004,6 +1004,12 @@ const save = () => {
1004 return; 1004 return;
1005 } 1005 }
1006 } 1006 }
1007 if (params.damType == '2' && route.query.foundMode != '2') {
1008 if (!associationApiList?.length) {
1009 proxy.$ElMessage.error('资源类型为数据接口时，服务包不能为空');
1010 return;
1011 }
1012 }
1007 if (params.coverageArea == 'all') { 1013 if (params.coverageArea == 'all') {
1008 params.coverageArea = [['all']]; 1014 params.coverageArea = [['all']];
1009 } else if (!params.coverageArea) { 1015 } else if (!params.coverageArea) {
...@@ -1178,7 +1184,7 @@ const handleImportSave = (val) => { ...@@ -1178,7 +1184,7 @@ const handleImportSave = (val) => {
1178 <Form ref="baseInfoFormRef" :itemList="baseInfoFormItems" formId="base-info-form" :rules="baseInfoFormRules" 1184 <Form ref="baseInfoFormRef" :itemList="baseInfoFormItems" formId="base-info-form" :rules="baseInfoFormRules"
1179 @selectChange="baseSelectChange" @checkboxChange="handleBaseInfoCheckboxChange" col="col3" /> 1185 @selectChange="baseSelectChange" @checkboxChange="handleBaseInfoCheckboxChange" col="col3" />
1180 </ContentWrap> 1186 </ContentWrap>
1181 <ContentWrap id="product-info" title="服务包信息" expandSwicth style="margin-top: 15px" :isExpand="expandServiceInfo" 1187 <ContentWrap v-if="baseInfoFormRef?.formInline?.damType == '2'" id="product-info" title="服务包信息" expandSwicth style="margin-top: 15px" :isExpand="expandServiceInfo"
1182 @expand="(v) => (expandServiceInfo = v)" description="" class="mb16"> 1188 @expand="(v) => (expandServiceInfo = v)" description="" class="mb16">
1183 <Table ref="productTableRef" :tableInfo="productTableInfo" class="fiveRow-table" 1189 <Table ref="productTableRef" :tableInfo="productTableInfo" class="fiveRow-table"
1184 @table-select-change="hanldeTableSelectChange" /> 1190 @table-select-change="hanldeTableSelectChange" />
...@@ -1186,7 +1192,7 @@ const handleImportSave = (val) => { ...@@ -1186,7 +1192,7 @@ const handleImportSave = (val) => {
1186 <el-button link @click="addProduct" :icon="CirclePlus" v-preReClick>添加服务</el-button> 1192 <el-button link @click="addProduct" :icon="CirclePlus" v-preReClick>添加服务</el-button>
1187 </div> 1193 </div>
1188 </ContentWrap> 1194 </ContentWrap>
1189 <ContentWrap id="id-tableInfo" title="资源表" description="" :expand-swicth="true" :isExpand="assetTableInfoExpand" 1195 <ContentWrap v-if="baseInfoFormRef?.formInline?.damType != '2'" id="id-tableInfo" title="资源表" description="" :expand-swicth="true" :isExpand="assetTableInfoExpand"
1190 @expand="(v) => assetTableInfoExpand = v"> 1196 @expand="(v) => assetTableInfoExpand = v">
1191 <div v-show="assetDataTableInfo.data.length" class="tools_btns"> 1197 <div v-show="assetDataTableInfo.data.length" class="tools_btns">
1192 <el-button type="primary" @click="handleCreateTable" v-preReClick>添加</el-button> 1198 <el-button type="primary" @click="handleCreateTable" v-preReClick>添加</el-button>
...@@ -1256,4 +1262,22 @@ const handleImportSave = (val) => { ...@@ -1256,4 +1262,22 @@ const handleImportSave = (val) => {
1256 white-space: break-spaces; 1262 white-space: break-spaces;
1257 color: #999; 1263 color: #999;
1258 } 1264 }
1265
1266 .row-add-btn {
1267 .el-button--default {
1268 padding: 4px 0px;
1269 margin-top: 4px;
1270 }
1271
1272 :deep(.el-icon) {
1273 width: 16px;
1274 height: 16px;
1275
1276 svg {
1277 width: 16px;
1278 height: 16px;
1279 }
1280 }
1281 }
1282
1259 </style> 1283 </style>
......
src/views/data_asset/registerCatalogManagement.vue
...@@ -108,20 +108,20 @@ const searchItemList = ref([ ...@@ -108,20 +108,20 @@ const searchItemList = ref([
108 label: 'label' 108 label: 'label'
109 } 109 }
110 }, 110 },
111 // { 111 {
112 // type: "select", 112 type: "select",
113 // label: "", 113 label: "",
114 // field: "isRegister", 114 field: "isRegister",
115 // default: "", 115 default: "",
116 // placeholder: "登记状态", 116 placeholder: "登记状态",
117 // clearable: true, 117 clearable: true,
118 // filterable: true, 118 filterable: true,
119 // options: isRegisterOptions.value, 119 options: isRegisterOptions.value,
120 // props: { 120 props: {
121 // value: 'value', 121 value: 'value',
122 // label: 'label' 122 label: 'label'
123 // } 123 }
124 // }, 124 },
125 ]); 125 ]);
126 126
127 const pageInfo = ref({ 127 const pageInfo = ref({
......
src/views/data_service/apiManagement.vue
...@@ -189,56 +189,61 @@ const tableInfo = ref({ ...@@ -189,56 +189,61 @@ const tableInfo = ref({
189 btns: (scope) => { 189 btns: (scope) => {
190 const { row } = scope; 190 const { row } = scope;
191 let list: any = []; 191 let list: any = [];
192 const approveVO = row.approveVO || {};
193 if (!approveVO && row.isApprove == 'N') {
194 list.push({ label: "编辑", value: "edit", click: apiManageTableBtnMap.EDIT }); 192 list.push({ label: "编辑", value: "edit", click: apiManageTableBtnMap.EDIT });
195 list.push({ label: "删除", value: "del", click: apiManageTableBtnMap.DELETE }); 193 list.push({ label: "删除", value: "del", click: apiManageTableBtnMap.DELETE });
196 list.push({ label: "详情", value: "detail", click: apiManageTableBtnMap.DETAIL }); 194 list.push({ label: "详情", value: "detail", click: apiManageTableBtnMap.DETAIL });
197 list.push({ label: "复制", value: "copy", click: apiManageTableBtnMap.COPY }) 195 list.push({ label: "复制", value: "copy", click: apiManageTableBtnMap.COPY })
198 return list; 196 return list;
199 } 197 // const approveVO = row.approveVO || {};
200 const currentStaffGuid = userData.staffGuid 198 // if (!approveVO && row.isApprove == 'N') {
201 const bizApproveState = row.bizApproveState; 199 // list.push({ label: "编辑", value: "edit", click: apiManageTableBtnMap.EDIT });
202 const approveState = approveVO.approveState || null; 200 // list.push({ label: "删除", value: "del", click: apiManageTableBtnMap.DELETE });
203 const approveStaffGuids = approveVO.approveStaffGuids || []; 201 // list.push({ label: "详情", value: "detail", click: apiManageTableBtnMap.DETAIL });
204 const staffGuid = approveVO.staffGuid || ''; 202 // list.push({ label: "复制", value: "copy", click: apiManageTableBtnMap.COPY })
205 let isShowCancel = false; 203 // return list;
206 let flowState; 204 // }
207 if (approveState == 'N') { 205 // const currentStaffGuid = userData.staffGuid
208 flowState = 1; 206 // const bizApproveState = row.bizApproveState;
209 } 207 // const approveState = approveVO.approveState || null;
210 if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) { 208 // const approveStaffGuids = approveVO.approveStaffGuids || [];
211 flowState = 2; 209 // const staffGuid = approveVO.staffGuid || '';
212 } 210 // let isShowCancel = false;
213 if ((approveState == 'C' || approveState == 'R') && staffGuid == currentStaffGuid) { 211 // let flowState;
214 flowState = 3; 212 // if (approveState == 'N') {
215 } 213 // flowState = 1;
216 if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid) { 214 // }
217 isShowCancel = true; 215 // if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) {
218 } 216 // flowState = 2;
219 if (flowState === 1) { 217 // }
220 list = [{ label: "编辑", value: "edit", click: apiManageTableBtnMap.EDIT }] 218 // if ((approveState == 'C' || approveState == 'R') && staffGuid == currentStaffGuid) {
221 } 219 // flowState = 3;
222 if (flowState === 2) { 220 // }
223 list = [{ label: "通过", value: "pass", click: apiManageTableBtnMap.PASS }, { label: "驳回", value: "reject", click: apiManageTableBtnMap.REJECT }] 221 // if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid) {
224 } 222 // isShowCancel = true;
225 if (approveState == 'Y' && row.apiState != 1 && staffGuid == currentStaffGuid) { 223 // }
226 list = [{ label: "编辑", value: "edit", click: apiManageTableBtnMap.EDIT }] 224 // if (flowState === 1) {
227 } 225 // list = [{ label: "编辑", value: "edit", click: apiManageTableBtnMap.EDIT }]
228 if (flowState === 3 || (row.apiState != 1 && approveState !== 'A')) { 226 // }
229 list.push({ label: "删除", value: "del", click: apiManageTableBtnMap.DELETE }) 227 // if (flowState === 2) {
230 } 228 // list = [{ label: "通过", value: "pass", click: apiManageTableBtnMap.PASS }, { label: "驳回", value: "reject", click: apiManageTableBtnMap.REJECT }]
231 if (flowState === 3 && bizApproveState != 'D') { 229 // }
232 list.push({ label: "重新提交", value: "redit", click: apiManageTableBtnMap.EDIT }) 230 // if (approveState == 'Y' && row.apiState != 1 && staffGuid == currentStaffGuid) {
233 } 231 // list = [{ label: "编辑", value: "edit", click: apiManageTableBtnMap.EDIT }]
234 if (isShowCancel) { 232 // }
235 list.push({ label: "撤销", value: "revoke", click: apiManageTableBtnMap.REVOKE }) 233 // if (flowState === 3 || (row.apiState != 1 && approveState !== 'A')) {
236 } 234 // list.push({ label: "删除", value: "del", click: apiManageTableBtnMap.DELETE })
237 if (flowState !== 1) { 235 // }
238 list.push({ label: "详情", value: "detail", click: apiManageTableBtnMap.DETAIL }) 236 // if (flowState === 3 && bizApproveState != 'D') {
239 } 237 // list.push({ label: "重新提交", value: "redit", click: apiManageTableBtnMap.EDIT })
240 list.push({ label: "复制", value: "copy", click: apiManageTableBtnMap.COPY }) 238 // }
241 return list 239 // if (isShowCancel) {
240 // list.push({ label: "撤销", value: "revoke", click: apiManageTableBtnMap.REVOKE })
241 // }
242 // if (flowState !== 1) {
243 // list.push({ label: "详情", value: "detail", click: apiManageTableBtnMap.DETAIL })
244 // }
245 // list.push({ label: "复制", value: "copy", click: apiManageTableBtnMap.COPY })
246 // return list
242 }, 247 },
243 } 248 }
244 }); 249 });
...@@ -259,22 +264,27 @@ const apiManageTableBtnMap = { ...@@ -259,22 +264,27 @@ const apiManageTableBtnMap = {
259 /** 详情 */ 264 /** 详情 */
260 DETAIL: (scope) => { 265 DETAIL: (scope) => {
261 let row = scope.row; 266 let row = scope.row;
262 const approveVO = row.approveVO || {};
263 if (!approveVO && row.isApprove == 'N') {
264 router.push({ 267 router.push({
265 name: 'apiDetail', 268 name: 'apiDetail',
266 query: { guid: row.guid, type: 'detail' } 269 query: { guid: row.guid, type: 'detail' }
267 }); 270 });
268 return; 271 return;
269 } 272 // const approveVO = row.approveVO || {};
270 if (!row.approveGuid) { 273 // if (!approveVO && row.isApprove == 'N') {
271 proxy.$ElMessage.error(`【${row.apiName}】关联流程已删除！`); 274 // router.push({
272 return; 275 // name: 'apiDetail',
273 } 276 // query: { guid: row.guid, type: 'detail' }
274 router.push({ 277 // });
275 name: 'APIProcessDetail', 278 // return;
276 query: { guid: row.approveGuid, type: 'detail' } 279 // }
277 }); 280 // if (!row.approveGuid) {
281 // proxy.$ElMessage.error(`【${row.apiName}】关联流程已删除！`);
282 // return;
283 // }
284 // router.push({
285 // name: 'APIProcessDetail',
286 // query: { guid: row.approveGuid, type: 'detail' }
287 // });
278 }, 288 },
279 /** 撤回 */ 289 /** 撤回 */
280 REVOKE: (scope) => { 290 REVOKE: (scope) => {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!