From c16e953a14c593d2dee927b9ce45b1af91877149 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 07 三月 2025 17:55:06 +0800
Subject: [PATCH] 2025-03-07
---
src/menu/components/table/base-table/index.scss | 2 +-
src/menu/components/table/normal-table/index.scss | 2 +-
src/views/appcheck/index.jsx | 6 +++---
src/views/appmanage/index.jsx | 16 ++++++++--------
src/views/appmanage/submutilform/index.jsx | 28 ++++++++++++++++++++++++----
5 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/src/menu/components/table/base-table/index.scss b/src/menu/components/table/base-table/index.scss
index 80333d5..fb76fc3 100644
--- a/src/menu/components/table/base-table/index.scss
+++ b/src/menu/components/table/base-table/index.scss
@@ -42,7 +42,7 @@
}
.model-menu-action-list {
line-height: 40px;
- padding: 0px;
+ padding: 0px 150px 0px 0px;
>.ant-row {
padding-top: 10px;
min-height: 55px;
diff --git a/src/menu/components/table/normal-table/index.scss b/src/menu/components/table/normal-table/index.scss
index d14a40e..b2dca75 100644
--- a/src/menu/components/table/normal-table/index.scss
+++ b/src/menu/components/table/normal-table/index.scss
@@ -68,7 +68,7 @@
}
.model-menu-action-list {
line-height: 40px;
- padding: 0px;
+ padding: 0px 180px 0px 0px;
>.ant-row {
padding-top: 10px;
min-height: 55px;
diff --git a/src/views/appcheck/index.jsx b/src/views/appcheck/index.jsx
index 2e999fe..9dbbfd2 100644
--- a/src/views/appcheck/index.jsx
+++ b/src/views/appcheck/index.jsx
@@ -247,14 +247,14 @@
</Col>
<Col span={12}>
<div className="app-item">
- <div className="label">鐗堟潈:</div>
- <div className="content">{item.copyright || '鏃�'}</div>
+ <div className="label">搴旂敤鍚嶇О:</div>
+ <div className="content">{item.app_name || ''}</div>
</div>
</Col>
<Col span={12}>
<div className="app-item">
<div className="label">LOGO:</div>
- <div className="content">{item.logo ? <img style={{height: '18px'}} src={item.logo} alt="" /> : '鏃�'}</div>
+ <div className="content">{item.app_icon ? <img style={{height: '18px'}} src={item.app_icon} alt="" /> : '鏃�'}</div>
</div>
</Col>
</Row>
diff --git a/src/views/appmanage/index.jsx b/src/views/appmanage/index.jsx
index ea9e714..a67c41a 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)))}'`
+ 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 || ''}'`
})
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)))}'`
+ 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 || ''}'`
})
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)))}'`
+ 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 || ''}'`
})
param.LText = param.LText.join(' union all ')
param.LText = Utils.formatOptions(param.LText, 'x')
@@ -1278,14 +1278,14 @@
</Col>
<Col span={12}>
<div className="app-item">
- <div className="label">鏍囬:</div>
- <div className="content">{item.title || '鏃�'}</div>
+ <div className="label">搴旂敤鍚嶇О:</div>
+ <div className="content">{item.app_name || ''}</div>
</div>
</Col>
<Col span={12}>
<div className="app-item">
- <div className="label">缃戠珯澶村儚:</div>
- <div className="content">{item.favicon ? <img style={{width: '18px', height: '18px', borderRadius: '4px'}} src={item.favicon} alt="" /> : '鏃�'}</div>
+ <div className="label">LOGO:</div>
+ <div className="content">{item.app_icon ? <img style={{width: '18px', height: '18px', borderRadius: '4px'}} src={item.app_icon} alt="" /> : '鏃�'}</div>
</div>
</Col>
</Row>
@@ -1356,7 +1356,7 @@
okText="纭畾"
destroyOnClose
>
- <SubMutilForm type={subVisible} card={subVisible === 'edit' ? selectSubApp : ''} wrappedComponentRef={(inst) => this.submobcardRef = inst} inputSubmit={this.submitSubCard} />
+ <SubMutilForm type={subVisible} selectApp={selectApp} card={subVisible === 'edit' ? selectSubApp : ''} wrappedComponentRef={(inst) => this.submobcardRef = inst} inputSubmit={this.submitSubCard} />
</Modal>
</div>
)
diff --git a/src/views/appmanage/submutilform/index.jsx b/src/views/appmanage/submutilform/index.jsx
index 14976ea..c097389 100644
--- a/src/views/appmanage/submutilform/index.jsx
+++ b/src/views/appmanage/submutilform/index.jsx
@@ -126,7 +126,7 @@
}
render() {
- const { card, type } = this.props
+ const { card, type, selectApp } = this.props
const { getFieldDecorator } = this.props.form
const { typename, adapters, exts, langs, WXApps, WXMerchs } = this.state
const formItemLayout = {
@@ -201,6 +201,27 @@
<Select.Option value="bg_black_style_deep_red"><span className="color-block" style={{background: '#c32539'}}></span>娣辩孩鑹诧紙#c32539锛�</Select.Option>
<Select.Option value="bg_black_style_deep_blue"><span className="color-block" style={{background: '#1d3661'}}></span>娣辫摑鑹诧紙#1d3661锛�</Select.Option>
</Select>
+ )}
+ </Form.Item>
+ </Col>
+ <Col span={12}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="褰撳墠瀛愬簲鐢ㄧ殑鍚嶇О銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 搴旂敤鍚嶇О
+ </Tooltip>
+ }>
+ {getFieldDecorator('app_name', {
+ initialValue: card ? card.app_name || selectApp.remark || '' : selectApp.remark || '',
+ })(<Input placeholder="" autoComplete="off" onPressEnter={this.handleSubmit} />)}
+ </Form.Item>
+ </Col>
+ <Col span={12}>
+ <Form.Item label="LOGO">
+ {getFieldDecorator('app_icon', {
+ initialValue: card ? card.app_icon : ''
+ })(
+ <SourceComponent type="picture" placement="right"/>
)}
</Form.Item>
</Col>
@@ -281,11 +302,10 @@
</Col> : null} */}
<Col span={12}>
<Form.Item label={
- exts.includes('share') ?
- <Tooltip placement="topLeft" title="瀛愬簲鐢ㄥ強鍒嗕韩鏃剁殑鏍囬銆�">
+ <Tooltip placement="topLeft" title={`瀛愬簲鐢�${exts.includes('share') ? '鍙婂垎浜椂' : ''}鐨勬爣棰樸�俙}>
<QuestionCircleOutlined className="mk-form-tip" />
鏍囬
- </Tooltip> : '鏍囬'
+ </Tooltip>
}>
{getFieldDecorator('title', {
initialValue: card ? card.title || '' : '',
--
Gitblit v1.8.0