From 862b6cf69dc925a6138a7ebf79b782a5d7791202 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 03 一月 2020 12:13:52 +0800 Subject: [PATCH] 2020-01-03 --- src/tabviews/tableshare/actionList/index.jsx | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/tabviews/tableshare/actionList/index.jsx b/src/tabviews/tableshare/actionList/index.jsx index 83124f9..882cded 100644 --- a/src/tabviews/tableshare/actionList/index.jsx +++ b/src/tabviews/tableshare/actionList/index.jsx @@ -654,14 +654,14 @@ if (execAction.groups.length > 0) { execAction.groups.forEach(group => { group.sublist.forEach(field => { - if ((field.type === 'select' || field.type === 'link') && field.resourceType === '1') { + if ((field.type === 'select' || field.type === 'link') && field.resourceType === '1' && field.dataSource) { subfields.push(field) } }) }) } else { execAction.fields.forEach(field => { - if ((field.type === 'select' || field.type === 'link') && field.resourceType === '1') { + if ((field.type === 'select' || field.type === 'link') && field.resourceType === '1' && field.dataSource) { subfields.push(field) } }) @@ -682,9 +682,12 @@ arrfield = arrfield + ',' + item.linkField } + let _sql = Utils.getSelectQuerySql(item) + console.log(_sql) + _sql = Utils.formatOptions(_sql) let param = { func: 'sPC_Get_SelectedList', - LText: item.dataSourceSql, + LText: _sql, obj_name: 'data', arr_field: arrfield } @@ -752,11 +755,12 @@ this.setState({ confirmLoading: true }) - this.execSubmit(this.state.execAction, this.state.tabledata, () => { - this.setState({ - confirmLoading: false - }) - }, res) + console.log(res) + // this.execSubmit(this.state.execAction, this.state.tabledata, () => { + // this.setState({ + // confirmLoading: false + // }) + // }, res) }, () => {}) } -- Gitblit v1.8.0