Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
4d39b6ef by lihua
Options

数据产品目录修改

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