From d7bfb03cef659e455976297f383db991c579f690 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 09 三月 2025 11:09:38 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/views/appmanage/index.jsx | 6 +++---
src/views/appmanage/submutilform/index.scss | 6 ++++++
src/views/appmanage/submutilform/index.jsx | 30 +++++++++++++++++++++++++++++-
src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx | 9 +++++++--
4 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
index 677ab76..c1fca30 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
import { Form, Tabs, Row, Col, Input, Button, Popconfirm, Tooltip, notification, Modal, message, InputNumber, Radio, Typography } from 'antd'
-import { EditOutlined, QuestionCircleOutlined, StopOutlined, CheckCircleOutlined, SwapOutlined, DeleteOutlined } from '@ant-design/icons'
+import { EditOutlined, QuestionCircleOutlined, StopOutlined, CheckCircleOutlined, SwapOutlined, DeleteOutlined, ExclamationOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -969,7 +969,12 @@
<div>
{card.label ? <div className="mk-com-name">{card.label} - 楠岃瘉淇℃伅</div> : null}
<Tabs activeKey={activeKey} className="excelin-verify-card-box" onChange={this.tabchange}>
- <TabPane tab="鍩虹楠岃瘉" key="basemsg">
+ <TabPane tab={
+ <span>
+ 鍩虹楠岃瘉
+ {verify.default === 'false' ? <span className="count-tip"><ExclamationOutlined style={{color: 'orange'}}/></span> : null}
+ </span>
+ } key="basemsg">
<Form {...formItemLayout}>
<Row gutter={24}>
{card.intertype === 'system' ? <Col span={8}>
diff --git a/src/views/appmanage/index.jsx b/src/views/appmanage/index.jsx
index 7c64c42..77a2cc2 100644
--- a/src/views/appmanage/index.jsx
+++ b/src/views/appmanage/index.jsx
@@ -677,7 +677,7 @@
param.LText = sublist.map(item => {
let _par = this.getCusParam(item)
- return `select '${item.ID}','${item.typename}','${selectApp.ID}','${sessionStorage.getItem('CloudUserID') || ''}','${window.GLOB.appkey || ''}','false','false','${item.role_type || 'true'}','${item.lang || 'zh-CN'}','${item.css || ''}','${item.title || ''}','${item.favicon || ''}','${item.user_binding || 'false'}','','${window.btoa(window.encodeURIComponent(JSON.stringify(_par)))}','${item.app_name || selectApp.remark || ''}','${item.app_icon || ''}','${item.allow_subscribe || ''}'`
+ return `select '${item.ID}','${item.typename}','${selectApp.ID}','${sessionStorage.getItem('CloudUserID') || ''}','${window.GLOB.appkey || ''}','false','false','${item.role_type || 'true'}','${item.lang || 'zh-CN'}','${item.css || ''}','${item.title || ''}','${item.favicon || ''}','${item.user_binding || 'false'}','','${window.btoa(window.encodeURIComponent(JSON.stringify(_par)))}','${item.app_name || selectApp.remark || ''}','${item.app_icon || ''}','${item.allow_subscribe || ''}','${item.link_remark || ''}'`
})
param.LText = param.LText.join(' union all ')
param.LText = Utils.formatOptions(param.LText, 'x')
@@ -956,7 +956,7 @@
param.LText = selectApp.sublist.map(item => {
let _par = this.getCusParam(item)
- return `select '${item.ID}','${item.typename}','${selectApp.ID}','${sessionStorage.getItem('CloudUserID') || ''}','${window.GLOB.appkey || ''}','false','false','${item.role_type || 'true'}','${item.lang || 'zh-CN'}','${item.css || ''}','${item.title || ''}','${item.favicon || ''}','${item.user_binding || 'false'}','','${window.btoa(window.encodeURIComponent(JSON.stringify(_par)))}','${item.app_name || selectApp.remark || ''}','${item.app_icon || ''}','${item.allow_subscribe || ''}'`
+ return `select '${item.ID}','${item.typename}','${selectApp.ID}','${sessionStorage.getItem('CloudUserID') || ''}','${window.GLOB.appkey || ''}','false','false','${item.role_type || 'true'}','${item.lang || 'zh-CN'}','${item.css || ''}','${item.title || ''}','${item.favicon || ''}','${item.user_binding || 'false'}','','${window.btoa(window.encodeURIComponent(JSON.stringify(_par)))}','${item.app_name || selectApp.remark || ''}','${item.app_icon || ''}','${item.allow_subscribe || ''}','${item.link_remark || ''}'`
})
param.LText = param.LText.join(' union all ')
param.LText = Utils.formatOptions(param.LText, 'x')
@@ -1099,7 +1099,7 @@
param.LText = sublist.map(item => {
let _par = this.getCusParam(item)
- return `select '${item.ID}','${item.typename}','${selectApp.ID}','${sessionStorage.getItem('CloudUserID') || ''}','${window.GLOB.appkey || ''}','false','false','${item.role_type || 'true'}','${item.lang || 'zh-CN'}','${item.css || ''}','${item.title || ''}','${item.favicon || ''}','${item.user_binding || 'false'}','','${window.btoa(window.encodeURIComponent(JSON.stringify(_par)))}','${item.app_name || selectApp.remark || ''}','${item.app_icon || ''}','${item.allow_subscribe || ''}'`
+ return `select '${item.ID}','${item.typename}','${selectApp.ID}','${sessionStorage.getItem('CloudUserID') || ''}','${window.GLOB.appkey || ''}','false','false','${item.role_type || 'true'}','${item.lang || 'zh-CN'}','${item.css || ''}','${item.title || ''}','${item.favicon || ''}','${item.user_binding || 'false'}','','${window.btoa(window.encodeURIComponent(JSON.stringify(_par)))}','${item.app_name || selectApp.remark || ''}','${item.app_icon || ''}','${item.allow_subscribe || ''}','${item.link_remark || ''}'`
})
param.LText = param.LText.join(' union all ')
param.LText = Utils.formatOptions(param.LText, 'x')
diff --git a/src/views/appmanage/submutilform/index.jsx b/src/views/appmanage/submutilform/index.jsx
index f6c26a1..9a4893e 100644
--- a/src/views/appmanage/submutilform/index.jsx
+++ b/src/views/appmanage/submutilform/index.jsx
@@ -7,6 +7,7 @@
import asyncComponent from '@/utils/asyncComponent'
import './index.scss'
+const { TextArea } = Input
const ColorSketch = asyncComponent(() => import('@/mob/colorsketch'))
const SourceComponent = asyncComponent(() => import('@/menu/components/share/sourcecomponent'))
@@ -213,6 +214,12 @@
}>
{getFieldDecorator('app_name', {
initialValue: card ? card.app_name || selectApp.remark || '' : selectApp.remark || '',
+ rules: [
+ {
+ pattern: /^[^']+$/,
+ message: '涓嶅彲浣跨敤鑻辨枃鍗曞紩鍙�'
+ }
+ ]
})(<Input placeholder="" autoComplete="off" onPressEnter={this.handleSubmit} />)}
</Form.Item>
</Col>
@@ -312,7 +319,13 @@
rules: exts.includes('share') ? [{
required: true,
message: '璇峰～鍐欐爣棰�!'
- }] : []
+ }, {
+ pattern: /^[^']+$/,
+ message: '涓嶅彲浣跨敤鑻辨枃鍗曞紩鍙�'
+ }] : [{
+ pattern: /^[^']+$/,
+ message: '涓嶅彲浣跨敤鑻辨枃鍗曞紩鍙�'
+ }]
})(<Input placeholder="" autoComplete="off" onPressEnter={this.handleSubmit} />)}
</Form.Item>
</Col>
@@ -469,6 +482,21 @@
)}
</Form.Item>
</Col> : null}
+ <Col span={24}>
+ <Form.Item label="澶囨敞">
+ {getFieldDecorator('link_remark', {
+ initialValue: card ? card.link_remark || '' : '',
+ rules: [
+ {
+ pattern: /^[^']+$/,
+ message: '涓嶅彲浣跨敤鑻辨枃鍗曞紩鍙�'
+ }
+ ]
+ })(
+ <TextArea placeholder="" rows={2}/>
+ )}
+ </Form.Item>
+ </Col>
</Row>
</Form>
)
diff --git a/src/views/appmanage/submutilform/index.scss b/src/views/appmanage/submutilform/index.scss
index 3bed946..06d7671 100644
--- a/src/views/appmanage/submutilform/index.scss
+++ b/src/views/appmanage/submutilform/index.scss
@@ -9,6 +9,12 @@
border-radius: 0 4px 4px 0;
}
}
+ .ant-form-item-label {
+ width: 140px;
+ }
+ .ant-form-item-control-wrapper {
+ width: calc(100% - 140px);
+ }
.ant-form-item-control {
height: 40px;
}
--
Gitblit v1.8.0