From cea7ef2f8a6b608f31d9ebffdda07c2a336db9c3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 07 七月 2023 09:24:00 +0800
Subject: [PATCH] 2023-07-07
---
src/utils/utils-datamanage.js | 17 ++++++++++++-----
src/tabviews/custom/components/calendar/index.jsx | 17 +++++++++++++----
src/menu/datasource/verifycard/customscript/index.jsx | 4 ++--
src/menu/datasource/verifycard/customscript/index.scss | 1 +
4 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/src/menu/datasource/verifycard/customscript/index.jsx b/src/menu/datasource/verifycard/customscript/index.jsx
index 3b897eb..95b2939 100644
--- a/src/menu/datasource/verifycard/customscript/index.jsx
+++ b/src/menu/datasource/verifycard/customscript/index.jsx
@@ -265,12 +265,12 @@
return (
<Form className="modal-source-setting-script">
<Row gutter={24}>
- {setting.tableName ? <Col span={5}>
+ {setting.tableName ? <Col span={6}>
<Form.Item label="琛ㄥ悕" style={{whiteSpace: 'nowrap', margin: 0}}>
{setting.tableName}
</Form.Item>
</Col> : null}
- <Col span={19}>
+ <Col span={18}>
<Form.Item label="鎶ラ敊瀛楁" style={{margin: 0}}>
ErrorCode, retmsg
<span style={{marginLeft: 25}}>
diff --git a/src/menu/datasource/verifycard/customscript/index.scss b/src/menu/datasource/verifycard/customscript/index.scss
index f663222..d1c3a10 100644
--- a/src/menu/datasource/verifycard/customscript/index.scss
+++ b/src/menu/datasource/verifycard/customscript/index.scss
@@ -15,6 +15,7 @@
}
.ant-form-item-control-wrapper {
flex: auto;
+ max-width: calc(100% - 110px);
}
.CodeMirror {
height: 350px;
diff --git a/src/tabviews/custom/components/calendar/index.jsx b/src/tabviews/custom/components/calendar/index.jsx
index 2ad633d..c9ba92b 100644
--- a/src/tabviews/custom/components/calendar/index.jsx
+++ b/src/tabviews/custom/components/calendar/index.jsx
@@ -27,6 +27,7 @@
loading: false, // 鏁版嵁鍔犺浇鐘舵��
data: null, // 鏁版嵁
search: '',
+ year: new Date().getFullYear(),
BData: ''
}
@@ -36,14 +37,22 @@
* @description 鍒濆鍖栧鐞�
*/
UNSAFE_componentWillMount () {
- let _config = fromJS(this.props.config).toJS()
-
+ const { config } = this.props
+ let _config = fromJS(config).toJS()
let BData = ''
if (_config.setting.supModule) {
BData = window.GLOB.CacheData.get(_config.setting.supModule)
} else {
BData = window.GLOB.CacheData.get(_config.$pageId)
+ }
+
+ if (_config.setting.interType === 'system') {
+ if (/@mk_year@/ig.test(_config.setting.dataresource) || /@mk_year@/ig.test(_config.setting.customScript)) {
+ _config.setting.$re_year = true
+ }
+ } else {
+ _config.setting.$re_year = true
}
this.setState({
@@ -148,7 +157,7 @@
async loadData () {
const { mainSearch } = this.props
- const { config, arr_field, BID, search } = this.state
+ const { config, arr_field, BID, search, year } = this.state
if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.setState({
@@ -178,7 +187,7 @@
})
let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, 1, 99999, BID)
+ let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, 1, 99999, BID, '', year)
let result = await Api.genericInterface(param)
if (result.status) {
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index df476aa..8f58442 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -15,13 +15,13 @@
* @param {String} BID 涓婄骇ID
* @return {Object} param
*/
- static getQueryDataParams (setting, arrFields, search = [], orderBy = '', pageIndex = 1, pageSize = 10, BID, id) {
+ static getQueryDataParams (setting, arrFields, search = [], orderBy = '', pageIndex = 1, pageSize = 10, BID, id, year) {
let param = null
if (setting.interType === 'system') {
- param = this.getDefaultQueryParam(setting, arrFields, search, orderBy, pageIndex, pageSize, id, BID)
+ param = this.getDefaultQueryParam(setting, arrFields, search, orderBy, pageIndex, pageSize, id, BID, year)
} else {
- param = this.getCustomQueryParam(setting, search, orderBy, pageIndex, pageSize, id)
+ param = this.getCustomQueryParam(setting, search, orderBy, pageIndex, pageSize, id, year)
}
if (BID) {
@@ -38,7 +38,7 @@
/**
* @description 鑾峰彇鐢ㄦ埛鑷畾涔夊瓨鍌ㄨ繃绋嬩紶鍙�
*/
- static getCustomQueryParam (setting, search, orderBy, pageIndex, pageSize, id) {
+ static getCustomQueryParam (setting, search, orderBy, pageIndex, pageSize, id, year) {
let param = Utils.formatCustomMainSearch(search)
if (orderBy) {
@@ -50,6 +50,8 @@
} else if (setting.laypage) {
param.PageIndex = pageIndex
param.PageSize = pageSize
+ } else if (setting.$re_year) {
+ param.mk_year = year
}
if (setting.interType === 'inner') {
@@ -98,7 +100,7 @@
/**
* @description 鑾峰彇绯荤粺瀛樺偍杩囩▼鐨勫弬鏁�
*/
- static getDefaultQueryParam (setting, arrFields, search, orderBy, pageIndex, pageSize, id, BID) {
+ static getDefaultQueryParam (setting, arrFields, search, orderBy, pageIndex, pageSize, id, BID, year) {
let param = {
func: 'sPC_Get_TableData',
obj_name: 'data',
@@ -160,6 +162,11 @@
_dataresource = _dataresource.replace(/@typename@/ig, `'admin'`)
_customScript = _customScript.replace(/@typename@/ig, `'admin'`)
+ if (setting.$re_year) {
+ _dataresource = _dataresource.replace(/@mk_year@/ig, year)
+ _customScript = _customScript.replace(/@mk_year@/ig, year)
+ }
+
let regoptions = null
if (setting.queryType === 'statistics' || _customScript) {
let allSearch = Utils.getAllSearchOptions(search)
--
Gitblit v1.8.0