From abe942f4c6d49a6ad42acaf8e74f5f02b5ffc089 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 04 六月 2021 15:26:17 +0800
Subject: [PATCH] 2021-06-04

---
 src/utils/utils.js |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index 1625ae6..c99abbb 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1057,7 +1057,7 @@
  * @return {Object}  tab       鏍囩淇℃伅
  * @return {Boolean} retmsg    鏄惁闇�瑕佹暟鎹繑鍥�
  */
-export function getSysDefaultSql (btn, setting, formdata, param, data, columns, tab, retmsg = false, moduleParams) {
+export function getSysDefaultSql (btn, setting, formdata, param, data, columns, tab, retmsg = false, moduleParams, getOptions) {
   let primaryId = param.ID
   let BID = param.BID
   let verify = btn.verify || {}
@@ -1299,8 +1299,8 @@
       datasource = '(' + datasource + ') tb'
     }
 
-    if (setting.queryType === 'statistics' || customScript) {
-      let allSearch = this.getAllSearchOptions(search)
+    if (getOptions && (setting.queryType === 'statistics' || customScript)) {
+      let allSearch = getOptions(search)
 
       let regoptions = allSearch.map(item => {
         return {

--
Gitblit v1.8.0