From 2cfae2f496b90278d9af3c11159faa655e25a4ef Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 29 六月 2020 19:21:06 +0800
Subject: [PATCH] 2020-06-29
---
src/templates/sharecomponent/actioncomponent/verifyprint/index.scss | 4
src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx | 5 +
src/views/mobdesign/index.scss | 18 +++++-
src/tabviews/zshare/fileupload/index.jsx | 6 ++
src/templates/zshare/formconfig.jsx | 62 ++++++++++----------
src/templates/sharecomponent/actioncomponent/actionform/index.jsx | 7 ++
src/mob/controller/index.scss | 2
src/utils/utils.js | 8 ++
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 9 ++
9 files changed, 81 insertions(+), 40 deletions(-)
diff --git a/src/mob/controller/index.scss b/src/mob/controller/index.scss
index c0411bf..2762e98 100644
--- a/src/mob/controller/index.scss
+++ b/src/mob/controller/index.scss
@@ -7,6 +7,8 @@
> .ant-collapse-item > .ant-collapse-header {
padding: 10px 40px 10px 16px;
+ background: #262E3F;
+ color: rgba(255, 255, 255, 0.85);
}
}
}
\ No newline at end of file
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index 5238361..383b19a 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -326,7 +326,7 @@
}).then(res => {
if (!res) return
// 澶栭儴璇锋眰
- _outParam = JSON.parse(JSON.stringify(res))
+ _outParam = fromJS(res).toJS()
if (this.props.menuType === 'HS') {
if (btn.sysInterface === 'true' && options.cloudServiceApi) {
@@ -345,6 +345,13 @@
if (btn.outerFunc) {
res.func = btn.outerFunc
}
+
+ if (this.props.menuType === 'HS' && res.func === 's_sDataDictb_excelIn') { // s_sDataDictb_excelIn 浜戠楠岃瘉
+ param.LText = Utils.formatOptions(result.sql)
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
+ param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.open_key = Utils.encrypt(param.secretkey, param.timestamp, true)
+ }
return Api.genericInterface(res)
}).then(response => {
diff --git a/src/tabviews/zshare/fileupload/index.jsx b/src/tabviews/zshare/fileupload/index.jsx
index 23bf614..99e0619 100644
--- a/src/tabviews/zshare/fileupload/index.jsx
+++ b/src/tabviews/zshare/fileupload/index.jsx
@@ -1,9 +1,11 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
+import moment from 'moment'
import { Upload, Button, Icon, Progress, notification } from 'antd'
import SparkMD5 from 'spark-md5'
import Api from '@/api'
+import Utils from '@/utils/utils.js'
import './index.scss'
let Url = '/Upload'
@@ -152,6 +154,10 @@
params.file.fileSize = file.size // 鏂囦欢澶у皬
params.file.fileChunks = chunks // 璁板綍鎵�鏈塩hunks鐨勯暱搴�
+ if (!/^[A-Za-z0-9]+$/.test(params.file.fileName)) { // 鏂囦欢鍚嶇О鍚湁鑻辨枃鍙婃暟瀛椾箣澶栧瓧绗︽椂锛屽悕绉扮郴缁熺敓鎴�
+ params.file.fileName = moment().format('YYYYMMDDHHmmss') + Utils.getuuid().substr(14)
+ }
+
totalFileReader.readAsArrayBuffer(file)
totalFileReader.onload = (e) => { // 瀵规暣涓猼otalFile鐢熸垚md5
spark.append(e.target.result)
diff --git a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
index 99d286c..8a9df3f 100644
--- a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
@@ -333,6 +333,7 @@
_options = ['label', 'OpenType', 'funcType', 'execMode', 'intertype', 'innerFunc', 'Ot', 'icon', 'class', 'execSuccess', 'execError']
}
}
+ let _fieldval = {}
this.setState({
formlist: this.state.formlist.map(item => {
@@ -340,12 +341,16 @@
if (item.hidden) return item
- if (item.key === 'Ot' && value === 'print') {
+ if (item.key === 'intertype') {
+ _fieldval.intertype = this.state.interType
+ } else if (item.key === 'Ot' && value === 'print') {
item.options = this.state.requireOptions
}
return item
})
+ }, () => {
+ this.props.form.setFieldsValue(_fieldval)
})
} else if (key === 'sqlType') {
let _fieldval = {}
diff --git a/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx
index bdf4181..c687f65 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx
@@ -357,8 +357,9 @@
<Row gutter={24}>
<Col span={24} className="print-tip">
<Form.Item label={'鎻愮ず'}>
- 濡傛灉姝ゆ寜閽殑鎵撳嵃鍔熻兘娑夊強澶氱鎵撳嵃绫诲瀷锛屼笖涓嶅悓绫诲瀷闇�瑕佽缃笉鍚岀殑鎵撳嵃鏈烘椂锛屽彲浠ユ坊鍔犳墦鍗扮被鍨嬫帶鍒朵俊鎭紝
- 璁剧疆瀹屾垚鍚庯紝鐢ㄦ埛鍙拡瀵逛笉鍚岀殑绫诲瀷璁剧疆瀵瑰簲鐨勬墦鍗版満銆傛敞锛氬湪杩斿洖鏁版嵁椤跺眰缁撴瀯涓坊鍔� printType銆乸rintCount銆乼emplateID 瀛楁锛屽彲鍒嗗埆鎺у埗鎵撳嵃绫诲瀷銆佹墦鍗版暟閲忓拰鎵撳嵃妯℃澘銆�
+ 濡傛灉姝ゆ寜閽秹鍙婂绉嶆暟鎹被鍨嬬殑鎵撳嵃锛岄渶瑕佽缃笉鍚岀殑鎵撳嵃鏈烘椂锛岃娣诲姞鎵撳嵃绫诲瀷鎺у埗淇℃伅锛岀敤鎴峰湪鑷畾涔夎缃腑锛屽彲鏍规嵁鎵撳嵃绫诲瀷璁剧疆瀵瑰簲鐨勬墦鍗版満銆�
+ 鎵撳嵃鏃讹紝鏁版嵁鐨勬墦鍗扮被鍨嬪彇鍐充簬杩斿洖鍊硷紙鍐呴儴鎴栧閮ㄦ帴鍙ｏ級涓殑 printType 瀛楁銆�
+ 娉細杩斿洖鍊间腑鐨� printCount銆乼emplateID 瀛楁锛屽彲鍒嗗埆鎺у埗鎵撳嵃鏁伴噺鍜屾墦鍗版ā鏉裤��
</Form.Item>
</Col>
<Col span={24}>
diff --git a/src/templates/sharecomponent/actioncomponent/verifyprint/index.scss b/src/templates/sharecomponent/actioncomponent/verifyprint/index.scss
index 6b181b0..521269f 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyprint/index.scss
+++ b/src/templates/sharecomponent/actioncomponent/verifyprint/index.scss
@@ -47,11 +47,11 @@
.print-tip {
margin-bottom: 25px;
.ant-form-item-label {
- width: 10.5%;
+ width: 8.5%;
line-height: 25px;
}
.ant-form-item-control-wrapper {
- width: 89.5%;
+ width: 91.5%;
.ant-form-item-children {
line-height: 25px;
}
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 9c16255..38b3f14 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -986,6 +986,37 @@
options: opentypes
},
{
+ type: 'select',
+ key: 'funcType',
+ label: Formdict['header.form.funcType'],
+ initVal: card.funcType || '',
+ required: true,
+ options: [{
+ value: 'changeuser',
+ text: Formdict['header.form.func.changeuser']
+ }, {
+ value: 'print',
+ text: Formdict['header.form.func.print']
+ }]
+ },
+ {
+ type: 'select',
+ key: 'execMode',
+ label: Formdict['model.form.execMode'],
+ initVal: card.execMode || 'exec',
+ required: true,
+ options: [{
+ value: 'exec',
+ text: Formdict['model.form.exec']
+ }, {
+ value: 'prompt',
+ text: Formdict['model.form.prompt']
+ }, {
+ value: 'pop',
+ text: Formdict['model.form.popform']
+ }]
+ },
+ {
type: 'radio',
key: 'intertype',
label: Formdict['header.form.intertype'],
@@ -1034,37 +1065,6 @@
tooltipClass: 'middle',
required: false,
readonly: false
- },
- {
- type: 'select',
- key: 'funcType',
- label: Formdict['header.form.funcType'],
- initVal: card.funcType || '',
- required: true,
- options: [{
- value: 'changeuser',
- text: Formdict['header.form.func.changeuser']
- }, {
- value: 'print',
- text: Formdict['header.form.func.print']
- }]
- },
- {
- type: 'select',
- key: 'execMode',
- label: Formdict['model.form.execMode'],
- initVal: card.execMode || 'exec',
- required: true,
- options: [{
- value: 'exec',
- text: Formdict['model.form.exec']
- }, {
- value: 'prompt',
- text: Formdict['model.form.prompt']
- }, {
- value: 'pop',
- text: Formdict['model.form.popform']
- }]
},
{
type: 'select',
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 1fb9f07..186bb97 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -874,6 +874,14 @@
let fsql = `${_sql}${_sqlInsert}${_sqlBottom}`
fsql = fsql.replace(/\n\s{8}/ig, '\n')
console.log(fsql)
+ } else { // s_sDataDictb_excelIn 浜戠瀵嗛挜楠岃瘉鍙傛暟
+ _sql = `
+ /* 绯荤粺鐢熸垚 */
+ declare @${item.sheet} table (jskey nvarchar(50))
+ Declare @UserName nvarchar(50),@FullName nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@tbid Nvarchar(512)
+
+ Select @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}'
+ `
}
return {
diff --git a/src/views/mobdesign/index.scss b/src/views/mobdesign/index.scss
index 322a91f..3fedde8 100644
--- a/src/views/mobdesign/index.scss
+++ b/src/views/mobdesign/index.scss
@@ -29,7 +29,7 @@
border-bottom: 1px solid #000;
cursor: pointer;
z-index: 10;
- background: #262626;
+ background: #202735;
i {
margin-bottom: 5px;
margin-left: 2px;
@@ -58,7 +58,7 @@
position: relative;
z-index: 10;
height: 1000px;
- background: #262626;
+ background: #202735;
}
}
@@ -68,8 +68,20 @@
top: 0;
height: 100%;
width: 300px;
- background: #ffffff;
+ background: #202735;
box-shadow: 0px 2px 2px #000;
+
+ >.ant-tabs {
+ >.ant-tabs-bar {
+ border-bottom: 1px solid #181F29;
+ .ant-tabs-tab {
+ color: rgba(255, 255, 255, 0.85);
+ }
+ .ant-tabs-tab-active.ant-tabs-tab {
+ color: #1890ff;
+ }
+ }
+ }
}
.mob-shell {
--
Gitblit v1.8.0