diff --git a/data-room-ui/example/customDatasetComponents/jsDataSet/OutputFieldDialog.vue b/data-room-ui/example/customDatasetComponents/jsDataSet/OutputFieldDialog.vue index 32ff5ec1..6aa6ee89 100644 --- a/data-room-ui/example/customDatasetComponents/jsDataSet/OutputFieldDialog.vue +++ b/data-room-ui/example/customDatasetComponents/jsDataSet/OutputFieldDialog.vue @@ -11,7 +11,7 @@ >
{ + this.insideFieldList.forEach(key => { this.fieldDesc[key.fieldName] = key.fieldDesc }) + this.$emit('setFieldList', this.insideFieldList) } else { this.fieldDesc = null } diff --git a/data-room-ui/example/customDatasetComponents/jsDataSet/index.vue b/data-room-ui/example/customDatasetComponents/jsDataSet/index.vue index 553445ff..6b78b881 100644 --- a/data-room-ui/example/customDatasetComponents/jsDataSet/index.vue +++ b/data-room-ui/example/customDatasetComponents/jsDataSet/index.vue @@ -200,7 +200,7 @@
{} + default: () => { } }, isEdit: { type: Boolean, @@ -448,8 +449,10 @@ export default { } }, watch: { - 'dataForm.config.script' () { - this.passTest = false + 'dataForm.config.script' (val) { + if (!val) { + this.passTest = false + } } }, mounted () { @@ -599,6 +602,7 @@ export default { }, // 脚本执行 scriptExecute (isInit = false) { + console.log(isInit) if (this.dataForm.config.script) { const javascript = this.dataForm.config.script let scriptMethod = null @@ -635,7 +639,7 @@ export default { }) } - if (this.outputFieldList.length && this.fieldDesc) { + if (this.outputFieldList.length && this.fieldDesc && !isInit) { this.buildFieldDesc() } // 如果有数据,就通过测试 @@ -701,151 +705,152 @@ export default { } - +.bs-table-box { + padding: 0; + height: 100% !important; + margin-bottom: 0 !important; +} + +.tree-box { + padding: 0; +} +