From 26a69937fc6b2ae4a440bac22d9436a9c2375b22 Mon Sep 17 00:00:00 2001 From: "liu.shiyi" Date: Thu, 10 Aug 2023 16:00:04 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=95=B0=E6=8D=AE=E9=9B=86=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=BC=93=E5=AD=98=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataSetManagement/src/CustomEditForm.vue | 18 +++++++++++++++ .../DataSetManagement/src/HttpEditForm.vue | 23 +++++++++++++++++-- .../DataSetManagement/src/JsEditForm.vue | 2 +- .../src/OriginalEditForm.vue | 20 ++++++++++++++++ .../DataSetManagement/src/ScriptEditForm.vue | 20 ++++++++++++++++ .../src/StoredProcedureEditForm.vue | 18 +++++++++++++++ 6 files changed, 98 insertions(+), 3 deletions(-) diff --git a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue index c8de2633..f299f1cc 100644 --- a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue @@ -155,6 +155,21 @@ + + + + + + + + + + + + { - const { id, name, typeId, remark, datasetType, moduleCode, editable, sourceId, config } = res + const { id, name, typeId, remark, datasetType, moduleCode, editable, sourceId, cache, config } = res const { script, paramsList, fieldDesc, fieldList } = config - this.dataForm = { id, name, typeId, remark, datasetType, moduleCode, editable, sourceId, config: { ...config }, labelIds: this.dataForm.labelIds } + this.dataForm = { id, name, typeId, remark, datasetType, moduleCode, editable, sourceId, cache, config: { ...config }, labelIds: this.dataForm.labelIds } this.fieldDesc = fieldDesc this.outputFieldList = fieldList this.newParamsList = _.cloneDeep(paramsList) @@ -869,6 +887,7 @@ export default { name: dataForm.name, typeId: dataForm.typeId, remark: dataForm.remark, + cache: dataForm.cache, datasetType: 'http', moduleCode: appCode, editable: appCode ? 1 : 0, diff --git a/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue b/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue index 808bea88..3a6dfd79 100644 --- a/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/JsEditForm.vue @@ -507,7 +507,7 @@ export default { getDataset(this.datasetId).then(res => { const { id, name, typeId, remark, datasetType, moduleCode, editable, sourceId, config } = res const { script, paramsList, fieldDesc, fieldList } = config - this.dataForm = { id, name, typeId, remark, datasetType, moduleCode, editable, sourceId, config: { script, paramsList } } + this.dataForm = { id, name, typeId, remark, datasetType, moduleCode, editable, sourceId, config: { script, paramsList }, labelIds: this.dataForm.labelIds } this.fieldDesc = fieldDesc this.outputFieldList = fieldList this.scriptExecute(true) diff --git a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue index 273775c7..04a3d231 100644 --- a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue @@ -257,6 +257,23 @@ /> + + + + + + + + + + + + + + + + + + +