From 137fb8ea6af2789b3238b22bac31d80bced41dfe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 28 七月 2021 11:39:39 +0800
Subject: [PATCH] 2021-07-28

---
 src/tabviews/custom/components/group/normal-group/index.jsx |  211 ++++++++++++++++++----------------------------------
 1 files changed, 75 insertions(+), 136 deletions(-)

diff --git a/src/tabviews/custom/components/group/normal-group/index.jsx b/src/tabviews/custom/components/group/normal-group/index.jsx
index d814a27..0ffbce3 100644
--- a/src/tabviews/custom/components/group/normal-group/index.jsx
+++ b/src/tabviews/custom/components/group/normal-group/index.jsx
@@ -2,24 +2,32 @@
 import PropTypes from 'prop-types'
 import { connect } from 'react-redux'
 import { is, fromJS } from 'immutable'
-import { Col, Empty, notification, Button } from 'antd'
-import moment from 'moment'
-import md5 from 'md5'
+import { Col, Empty, notification, Button, Row } from 'antd'
 
 import Api from '@/api'
-import options from '@/store/options.js'
 import asyncComponent from '@/utils/asyncComponent'
+import {
+  getStructuredParams,
+  getStructDefaultParam
+} from '@/utils/utils-datamanage.js'
 import Utils from '@/utils/utils.js'
 import './index.scss'
 
 // 閫氱敤缁勪欢
 const AntvBarAndLine = asyncComponent(() => import('@/tabviews/custom/components/chart/antv-bar-line'))
 const AntvPie = asyncComponent(() => import('@/tabviews/custom/components/chart/antv-pie'))
+const AntvDashboard = asyncComponent(() => import('@/tabviews/custom/components/chart/antv-dashboard'))
+const AntvScatter = asyncComponent(() => import('@/tabviews/custom/components/chart/antv-scatter'))
 const DataCard = asyncComponent(() => import('@/tabviews/custom/components/card/data-card'))
 const TableCard = asyncComponent(() => import('@/tabviews/custom/components/card/table-card'))
+const NormalTable = asyncComponent(() => import('@/tabviews/custom/components/table/normal-table'))
 const PropCard = asyncComponent(() => import('@/tabviews/custom/components/card/prop-card'))
 const BraftEditor = asyncComponent(() => import('@/tabviews/custom/components/editor/braft-editor'))
 const SandBox = asyncComponent(() => import('@/tabviews/custom/components/code/sand-box'))
+const NormalForm = asyncComponent(() => import('@/tabviews/custom/components/form/normal-form'))
+const NormalTree = asyncComponent(() => import('@/tabviews/custom/components/tree/antd-tree'))
+const CarouselDataCard = asyncComponent(() => import('@/tabviews/custom/components/carousel/data-card'))
+const CarouselPropCard = asyncComponent(() => import('@/tabviews/custom/components/carousel/prop-card'))
 
 class TabTransfer extends Component {
   static propTpyes = {
@@ -41,7 +49,6 @@
 
     // 鑾峰彇涓绘悳绱㈡潯浠�
     let _mainSearch = mainSearch ? fromJS(mainSearch).toJS() : []
-
     let params = []
     config.components.forEach(item => {
       if (item.type === 'tabs') return
@@ -50,8 +57,25 @@
       if (!item.format) return
 
       if (item.dataName && (!item.pageable || (item.pageable && !item.setting.laypage)) && item.setting.onload === 'true' && item.setting.sync === 'true') {
-        let param = this.getDefaultParam(item, _mainSearch)
-        params.push(param)
+        let searchlist = []
+        if (item.search && item.search.length > 0) {
+          searchlist = Utils.initMainSearch(item.search)
+        }
+        if (item.setting.useMSearch) {
+          let keys = searchlist.map(item => item.key)
+          _mainSearch.forEach(item => {
+            if (!keys.includes(item.key)) {
+              searchlist.push(item)
+            }
+          })
+        }
+
+        if (searchlist.filter(cell => cell.required && cell.value === '').length > 0) {
+          item.setting.sync = 'false'
+          item.setting.onload = 'false'
+        } else {
+          params.push(getStructDefaultParam(item, searchlist))
+        }
       } else {
         item.setting.sync = 'false'
       }
@@ -71,137 +95,10 @@
   }
 
   /**
-   * @description 鑾峰彇绯荤粺瀛樺偍杩囩▼ sPC_Get_TableData 鐨勫弬鏁�
-   */
-  getDefaultParam = (component, mainSearch) => {
-    const { columns, search, setting, dataName, format } = component
-    
-    let searchlist = []
-    if (search && search.length > 0) {
-      searchlist = Utils.initMainSearch(search)
-    }
-
-    if (setting.useMSearch === 'true') {
-      let keys = searchlist.map(item => item.key)
-      mainSearch.forEach(item => {
-        if (!keys.includes(item.key)) {
-          searchlist.push(item)
-        }
-      })
-    }
-
-    let arr_field = columns.map(col => col.field)
-    let _dataresource = setting.dataresource
-    let _customScript = setting.customScript
-
-    if (setting.queryType === 'statistics' || _customScript) {
-      let allSearch = Utils.getAllSearchOptions(searchlist)
-      let regoptions = allSearch.map(item => {
-        return {
-          reg: new RegExp('@' + item.key + '@', 'ig'),
-          value: `'${item.value}'`
-        }
-      })
-
-      regoptions.forEach(item => {
-        if (_dataresource && setting.queryType === 'statistics') {
-          _dataresource = _dataresource.replace(item.reg, item.value)
-        }
-        if (_customScript) {
-          _customScript = _customScript.replace(item.reg, item.value)
-        }
-      })
-    }
-
-    let _search = ''
-    if (setting.queryType !== 'statistics' && _dataresource) {
-      _search = Utils.joinMainSearchkey(searchlist)
-      _search = _search ? 'where ' + _search : ''
-    }
-
-    if (setting.order && _dataresource) {
-      _dataresource = `select top 1000 ${arr_field.join(',')} from (select ${arr_field.join(',')} ,ROW_NUMBER() over(order by ${setting.order}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows `
-    } else if (_dataresource) {
-      _dataresource = `select top 1000 ${arr_field.join(',')} from ${_dataresource} ${_search} `
-    }
-
-    // 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
-    if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
-      _customScript &&  console.info(`${_dataresource ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
-      _dataresource &&  console.info(_dataresource)
-    }
-
-    return {
-      name: dataName,
-      columns: columns,
-      par_tablename: '',
-      type: format === 'array' ? format : '',
-      primaryKey: setting.primaryKey || '',
-      foreign_key: '',
-      sql: _dataresource,
-      script: _customScript
-    }
-  }
-
-  /**
    * @description 涓昏〃鏁版嵁鍔犺浇
    */ 
   loadmaindata = (params) => {
-    const { config } = this.props
-    let LText_field = []
-    let diffUser = false
-    let userName = sessionStorage.getItem('User_Name') || ''
-    let fullName = sessionStorage.getItem('Full_Name') || ''
-    let city = sessionStorage.getItem('city') || ''
-
-    if (sessionStorage.getItem('isEditState') === 'true') {
-      userName = sessionStorage.getItem('CloudUserName') || ''
-      fullName = sessionStorage.getItem('CloudFullName') || ''
-    }
-    
-    let _LText = params.map((item, index) => {
-      let _script = item.script
-
-      if (index === 0) {
-        _script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@login_city nvarchar(50)
-          select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}', @login_city='${city}'
-          ${_script}
-        `
-      }
-      if (!diffUser && (/@userid@/ig.test(item.sql) || /@userid@/ig.test(_script))) {
-        diffUser = true
-      }
-
-      item.columns.forEach(cell => {
-        LText_field.push(`Select '${item.name}' as tablename,'${cell.field}' as fieldname,'${cell.datatype}' as field_type`)
-      })
-      return `Select '${item.name}' as tablename,'${window.btoa(window.encodeURIComponent(item.sql))}' as LText,'${window.btoa(window.encodeURIComponent(_script))}' as Lcustomize,'${item.type}' as table_type,'${item.primaryKey}' as primary_key,'${item.par_tablename}' as par_tablename,'${item.foreign_key}' as foreign_key,'${index}' as Sort`
-    })
-
-    let param = {
-      func: 'sPC_Get_structured_data',
-      LText: _LText.join(' union all '),
-      LText_field: LText_field.join(' union all ')
-    }
-
-    let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(param.LText)
-
-    param.LText1 = LText1
-    param.LText = LText
-    param.LText2 = LText2
-    param.LText_field = Utils.formatOptions(param.LText_field)
-
-    if (config.cacheUseful === 'true') {
-      param.time_type = config.timeUnit
-      param.time_limit = config.cacheTime
-      if (diffUser) {
-        param.userid = sessionStorage.getItem('UserID')
-      }
-      param.data_md5 = md5(JSON.stringify(param))
-    }
-
-    param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
-    param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+    let param = getStructuredParams(params, this.props.config)
 
     Api.getLocalConfig(param).then(result => {
       if (result.status) {
@@ -252,6 +149,36 @@
             <AntvPie data={data} config={item} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
           </Col>
         )
+      } else if (item.type === 'dashboard') {
+        return (
+          <Col span={item.width} key={item.uuid}>
+            <AntvDashboard config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
+          </Col>
+        )
+      } else if (item.type === 'form') {
+        return (
+          <Col span={item.width} key={item.uuid}>
+            <NormalForm config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
+          </Col>
+        )
+      } else if (item.type === 'scatter') {
+        return (
+          <Col span={item.width} key={item.uuid}>
+            <AntvScatter config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
+          </Col>
+        )
+      } else if (item.type === 'carousel' && item.subtype === 'datacard') {
+        return (
+          <Col span={item.width} key={item.uuid}>
+            <CarouselDataCard config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
+          </Col>
+        )
+      } else if (item.type === 'carousel' && item.subtype === 'propcard') {
+        return (
+          <Col span={item.width} key={item.uuid}>
+            <CarouselPropCard config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
+          </Col>
+        )
       } else if (item.type === 'card' && item.subtype === 'datacard') {
         return (
           <Col span={item.width} key={item.uuid}>
@@ -268,6 +195,18 @@
         return (
           <Col span={item.width} key={item.uuid}>
             <TableCard config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
+          </Col>
+        )
+      } else if (item.type === 'table' && item.subtype === 'normaltable') {
+        return (
+          <Col span={item.width} key={item.uuid}>
+            <NormalTable config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
+          </Col>
+        )
+      } else if (item.type === 'tree') {
+        return (
+          <Col span={item.width} key={item.uuid}>
+            <NormalTree config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
           </Col>
         )
       } else if (item.type === 'editor') {
@@ -366,7 +305,7 @@
     return (
       <div className="normal-group-wrap" id={config.uuid} style={config.style}>
         {config.setting && config.setting.print === 'true' ? <Button className="print-button" icon="printer" loading={printing} onClick={this.print}></Button> : null}
-        {this.getComponents()}
+        <Row>{this.getComponents()}</Row>
       </div>
     )
   }

--
Gitblit v1.8.0