From d1cd5af5adb53e91efdd278328e1b6f8ad834fb5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 二月 2025 21:11:56 +0800
Subject: [PATCH] Merge branch 'positec' into dms

---
 src/menu/components/share/searchcomponent/index.jsx |   63 +++++++++++++++++--------------
 1 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/src/menu/components/share/searchcomponent/index.jsx b/src/menu/components/share/searchcomponent/index.jsx
index 3d94abe..27a0c1b 100644
--- a/src/menu/components/share/searchcomponent/index.jsx
+++ b/src/menu/components/share/searchcomponent/index.jsx
@@ -2,11 +2,9 @@
 import PropTypes from 'prop-types'
 import { is, fromJS } from 'immutable'
 import { Modal, notification } from 'antd'
-import moment from 'moment'
 
 import MKEmitter from '@/utils/events.js'
 import Api from '@/api'
-import Utils from '@/utils/utils.js'
 import { getSearchForm } from '@/templates/zshare/formconfig'
 
 import SearchForm from '@/templates/sharecomponent/searchcomponent/searchform'
@@ -66,12 +64,24 @@
     MKEmitter.removeListener('addSearch', this.addSearch)
   }
 
-  addSearch = (cardId, element) => {
+  addSearch = (cardId, element, type) => {
     if (cardId !== this.props.config.uuid) return
 
     const { searchlist } = this.state
 
-    this.setState({searchlist: [...searchlist, element]})
+    if (type === 'replace') {
+      delete element.focus
+      this.setState({
+        searchlist: searchlist.map(cell => {
+          if (cell.field && cell.field.toLowerCase() === element.field.toLowerCase()) {
+            return element
+          }
+          return cell
+        }),
+      })
+    } else {
+      this.setState({searchlist: [...searchlist, element]})
+    }
     this.handleSearch(element)
   }
 
@@ -95,6 +105,7 @@
    * @description 鎼滅储鏉′欢缂栬緫锛岃幏鍙栨悳绱㈡潯浠惰〃鍗曚俊鎭�
    */
   handleSearch = (card) => {
+    const { config } = this.props
     const { searchlist } = this.state
     let linkableFields = []
 
@@ -109,10 +120,17 @@
       })
     })
 
+    let columns = null
+    if (config.columns && config.columns.length) {
+      columns = config.columns.map(item => {
+        return {key: item.uuid, text: item.field, value: item.field, label: item.label}
+      })
+    }
+
     this.setState({
       visible: true,
       card: card,
-      formlist: getSearchForm(card, linkableFields, [], 'header')
+      formlist: getSearchForm(card, linkableFields, columns, 'header')
     })
   }
 
@@ -199,30 +217,17 @@
         return
       }
 
-      if (['select', 'multiselect', 'link', 'checkcard'].includes(res.type) && res.resourceType === '1' && /\s/.test(res.dataSource)) {
+      if (['select', 'multiselect', 'link', 'checkcard'].includes(res.type) && res.resourceType === '1' && res.database !== 'sso' && /\s/.test(res.dataSource)) {
         this.setState({
           sqlVerifing: true
         })
 
-        let param = {
-          func: 's_debug_sql',
-          exec_type: 'y',
-          LText: res.dataSource
-        }
-
-        param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
-        param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${param.timestamp}'`)
-        param.LText = param.LText.replace(/\n/g, ' ')
+        let sql = `declare @mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20)
+        ${res.dataSource}`
+        sql = sql.replace(/@\$|\$@/ig, '')
         
-        param.LText = Utils.formatOptions(param.LText)
-        param.secretkey = Utils.encrypt('', param.timestamp)
-
-        if (window.GLOB.mainSystemApi && res.database === 'sso') {
-          param.rduri = window.GLOB.mainSystemApi
-        }
-        
-        Api.genericInterface(param).then(result => {
-          if (result.status) {
+        Api.sDebug(sql).then(result => {
+          if (result.status || result.ErrCode === '-2') {
             this.setState({
               sqlVerifing: false,
               searchlist: _searchlist,
@@ -254,19 +259,19 @@
    */
   deleteElement = (card) => {
     const { config } = this.props
-    let _this = this
+    let that = this
 
     confirm({
       content: `纭畾鍒犻櫎 - ${card.label} 锛焋,
       onOk() {
-        let _searchlist = fromJS(_this.state.searchlist).toJS()
+        let _searchlist = fromJS(that.state.searchlist).toJS()
 
         _searchlist = _searchlist.filter(item => item.uuid !== card.uuid)
 
-        _this.setState({
+        that.setState({
           searchlist: _searchlist
         }, () => {
-          _this.props.updatesearch({...config, search: _searchlist})
+          that.props.updatesearch({...config, search: _searchlist})
         })
       },
       onCancel() {}
@@ -288,7 +293,7 @@
         <Modal
           title="鎼滅储鏉′欢-缂栬緫"
           visible={visible}
-          width={850}
+          width={950}
           maskClosable={false}
           onOk={this.handleSubmit}
           confirmLoading={sqlVerifing}

--
Gitblit v1.8.0