From d8de196a5311f9ad7a01dbb988e0ad12b50f87e8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 07 三月 2025 21:24:48 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/datasource/verifycard/settingform/index.scss | 18 ++++++
src/menu/components/table/base-table/index.scss | 2
src/menu/components/table/normal-table/index.scss | 2
src/api/index.js | 10 ++-
src/views/appcheck/index.jsx | 6 +-
src/views/appmanage/index.jsx | 16 ++--
src/menu/datasource/verifycard/settingform/index.jsx | 4
src/templates/zshare/verifycard/index.jsx | 30 ++++++++++
src/tabviews/custom/components/share/braftContent/index.scss | 16 +++++
src/views/appmanage/submutilform/index.jsx | 45 +++++++++++++-
src/menu/datasource/verifycard/index.jsx | 20 ++++++
11 files changed, 145 insertions(+), 24 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index da8093a..86a16f4 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -48,10 +48,12 @@
okText: '鐭ラ亾浜�',
onOk: () => {
window.GLOB.$error = false
- sessionStorage.clear()
- if (!!(window.history && window.history.pushState)) {
- window.history.replaceState(null, null, window.location.href.split('#')[0] + '#/login')
- window.location.reload()
+ if (!/#\/login/.test(window.location.href)) {
+ sessionStorage.clear()
+ if (!!(window.history && window.history.pushState)) {
+ window.history.replaceState(null, null, window.location.href.split('#')[0] + '#/login')
+ window.location.reload()
+ }
}
}
})
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/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index 2de2854..a6b1d41 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -55,6 +55,7 @@
oriConfig: null,
scriptValue: '',
cols: null,
+ hasMainSearch: false,
colColumns: [
{
title: '鍚嶇О',
@@ -187,6 +188,21 @@
}>
<span className="operation-btn" style={{color: '#ff4d4f'}}><DeleteOutlined /></span>
</Popconfirm>
+ <span className="anticon operation-btn" style={{color: '#4D6BFE'}} onClick={() => {
+ if (record.sql) {
+ sessionStorage.setItem('deepseek_sql', `瀵逛互涓媠ql server鑴氭湰锛岀紪鍐欐敞閲婏紝涓嶈兘鐢�--锛屽彧鑳界敤/**/ 锛孈bid@鏄笂绾х粍浠秈d,@id@鏄綋鍓嶈鏁版嵁id锛孈userid@涓哄綋鍓嶇櫥褰曠敤鎴穒d锛屾墍鏈夊瓧娈典笉瑕佺敤..鏉ョ渷鐣ワ紝涓嶈澧炲姞杩囧鐨勫洖杞︽敼鍙樺師鏈夋牸寮忥紝杩欐牱浼氬奖鍝嶄唬鐮佺殑鍙鎬э紝濡傛灉浠ｇ爜澶暱涓�鏉″洖澶嶄笉瀹岋紝灏卞洖澶嶅鏉′俊鎭畬鎴怽n${record.sql}`)
+
+ window.open('#/ai')
+
+ setTimeout(() => {
+ sessionStorage.removeItem('deepseek_sql')
+ }, 0)
+ }
+ }}>
+ <svg viewBox="0 0 1391 1024" width="20px" fill="currentColor">
+ <path d="M1361.92 83.136c-14.272-7.04-20.416 6.272-28.736 12.992-2.816 2.24-5.248 5.12-7.68 7.68-20.8 22.336-45.056 36.864-76.8 35.136-46.464-2.56-86.08 12.032-121.152 47.616-7.552-43.904-32.256-70.08-69.888-86.912-19.712-8.768-39.68-17.472-53.376-36.48-9.664-13.44-12.288-28.48-17.216-43.264-3.008-8.96-6.08-18.112-16.32-19.712-11.2-1.728-15.552 7.68-19.968 15.424-17.536 32.128-24.32 67.52-23.68 103.296 1.6 80.448 35.52 144.576 103.04 190.144 7.68 5.312 9.6 10.56 7.168 18.176-4.608 15.68-10.048 30.976-14.912 46.592-3.072 10.112-7.68 12.352-18.304 8a308.224 308.224 0 0 1-97.28-66.176c-48-46.4-91.392-97.664-145.472-137.792a655.36 655.36 0 0 0-38.528-26.432c-55.232-53.76 7.232-97.792 21.632-103.04 15.104-5.376 5.312-24.128-43.52-23.936C652.032 24.704 607.36 41.024 550.4 62.72a156.8 156.8 0 0 1-26.048 7.68 542.016 542.016 0 0 0-161.408-5.696c-105.6 11.904-189.888 61.824-251.904 147.2C36.608 314.24 19.072 430.848 40.512 552.32c22.528 128 87.808 234.048 188.16 316.992 104 85.888 223.808 128 360.512 120 82.944-4.864 175.424-16 279.68-104.32 26.368 13.056 53.888 18.24 99.712 22.272 35.2 3.328 69.184-1.792 95.424-7.232 41.216-8.704 38.4-46.848 23.424-53.888-120.576-56.32-94.208-33.408-118.272-51.84 61.376-72.768 153.792-148.224 189.952-392.768 2.816-19.392 0.384-31.552 0-47.36-0.256-9.536 1.92-13.312 12.8-14.4a231.04 231.04 0 0 0 86.592-26.56c78.272-42.88 109.696-113.024 117.184-197.184 1.088-12.928-0.256-26.24-13.76-32.96z m-681.408 757.76c-116.928-92.096-173.696-122.368-197.12-120.96-21.888 1.152-17.984 26.304-13.184 42.624 5.12 16.128 11.648 27.328 20.8 41.408 6.464 9.408 10.752 23.424-6.272 33.92-37.76 23.424-103.232-7.872-106.24-9.472-76.288-44.8-140.032-104.192-184.96-185.344-43.264-78.08-68.48-161.92-72.576-251.328-1.152-21.632 5.184-29.312 26.688-33.152a265.6 265.6 0 0 1 85.696-2.24c119.296 17.472 220.928 71.04 306.048 155.52 48.768 48.32 85.504 105.92 123.392 162.176 40.256 59.776 83.648 116.672 138.88 163.392 19.392 16.32 35.072 28.8 49.92 37.952-44.928 5.056-119.872 6.08-171.008-34.496z m56.064-361.024a17.152 17.152 0 1 1 2.752 9.6 16.896 16.896 0 0 1-2.752-9.664z m174.08 89.472a102.72 102.72 0 0 1-33.024 8.96 70.528 70.528 0 0 1-44.736-14.272c-15.296-12.8-26.176-19.968-30.848-42.496a99.264 99.264 0 0 1 0.832-32.96c4.032-18.368-0.384-30.08-13.248-40.768-10.624-8.768-23.872-11.072-38.592-11.072a31.168 31.168 0 0 1-14.272-4.416c-6.144-3.072-11.136-10.752-6.336-20.16 1.536-3.008 8.96-10.304 10.752-11.712 19.84-11.328 42.88-7.68 64.192 0.896 19.712 8.064 34.56 22.848 56 43.776 21.952 25.28 25.792 32.384 38.4 51.328 9.856 14.848 18.816 30.208 24.96 47.616 3.776 10.88-1.152 19.776-14.08 25.28z"></path>
+ </svg>
+ </span>
</div>)
}
]
@@ -254,6 +270,7 @@
searches: formatSearch(search),
searchKey: '',
debugId: _setting.debugId || '',
+ hasMainSearch: mainSearch && mainSearch.length,
oriConfig: fromJS({
scripts,
columns: columns,
@@ -1228,7 +1245,7 @@
render() {
const { config } = this.props
- const { columns, subColumns, median, skip, setting, scripts, colColumns, scriptsColumns, activeKey, loading, searches, defaultsql, visible, pvisible, reload, script, scriptValue, searchKey, editLineId } = this.state
+ const { columns, subColumns, median, skip, setting, scripts, colColumns, scriptsColumns, activeKey, loading, searches, defaultsql, visible, pvisible, reload, script, scriptValue, searchKey, editLineId, hasMainSearch } = this.state
return (
<div className="model-data-source-wrap">
@@ -1246,6 +1263,7 @@
subColumns={subColumns}
setting={setting}
scripts={scripts}
+ hasMainSearch={hasMainSearch}
updateStatus={this.updateStatus}
updateColumns={this.updateColumns}
addProcess={this.addProcess}
diff --git a/src/menu/datasource/verifycard/settingform/index.jsx b/src/menu/datasource/verifycard/settingform/index.jsx
index 87940cc..147c84a 100644
--- a/src/menu/datasource/verifycard/settingform/index.jsx
+++ b/src/menu/datasource/verifycard/settingform/index.jsx
@@ -192,7 +192,7 @@
}
render() {
- const { columns, config } = this.props
+ const { columns, config, hasMainSearch } = this.props
const { getFieldDecorator } = this.props.form
const { setting, modules, innerRules, innertip, MenuType, visible } = this.state
@@ -562,7 +562,7 @@
initialValue: setting.useMSearch || 'true'
})(
<Radio.Group onChange={(e) => {this.onOptionChange(e.target.value, 'useMSearch')}}>
- <Radio value="true">浣跨敤</Radio>
+ <Radio value="true">浣跨敤{!hasMainSearch ? <Tooltip placement="top" title="鏃犲彲浣跨敤鐨勫閮ㄦ悳绱㈡潯浠�"><span className="mk-dot"></span></Tooltip> : null}</Radio>
<Radio value="false">涓嶄娇鐢�</Radio>
</Radio.Group>
)}
diff --git a/src/menu/datasource/verifycard/settingform/index.scss b/src/menu/datasource/verifycard/settingform/index.scss
index 87630fa..389394d 100644
--- a/src/menu/datasource/verifycard/settingform/index.scss
+++ b/src/menu/datasource/verifycard/settingform/index.scss
@@ -13,6 +13,24 @@
height: 150px;
}
}
+ .mk-dot {
+ display: inline-block;
+ width: 4px;
+ height: 4px;
+ border-radius: 4px;
+ background-color: orange;
+ vertical-align: top;
+ position: relative;
+ }
+ .mk-dot::before {
+ content: ' ';
+ display: block;
+ position: absolute;
+ top: -5px;
+ bottom: -10px;
+ left: -10px;
+ right: -5px;
+ }
}
.ant-radio-group {
white-space: nowrap;
diff --git a/src/tabviews/custom/components/share/braftContent/index.scss b/src/tabviews/custom/components/share/braftContent/index.scss
index 745de72..e81c2c6 100644
--- a/src/tabviews/custom/components/share/braftContent/index.scss
+++ b/src/tabviews/custom/components/share/braftContent/index.scss
@@ -43,4 +43,20 @@
border: 1px solid #ddd;
}
}
+ ul {
+ list-style: disc;
+ font-size: 16px;
+ margin: 1em 0px;
+ li {
+ list-style: disc;
+ }
+ }
+ ol {
+ list-style: normal;
+ font-size: 16px;
+ margin: 1em 0px;
+ li {
+ list-style: normal;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index e9d94b8..18b2f08 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -420,6 +420,21 @@
}>
<span className="operation-btn" style={{color: '#ff4d4f'}}><DeleteOutlined /></span>
</Popconfirm>
+ <span className="anticon operation-btn" style={{color: '#4D6BFE'}} onClick={() => {
+ if (record.sql) {
+ sessionStorage.setItem('deepseek_sql', `瀵逛互涓媠ql server鑴氭湰锛岀紪鍐欐敞閲婏紝涓嶈兘鐢�--锛屽彧鑳界敤/**/ 锛孈bid@鏄笂绾х粍浠秈d,@id@鏄綋鍓嶈鏁版嵁id锛孈userid@涓哄綋鍓嶇櫥褰曠敤鎴穒d锛屾墍鏈夊瓧娈典笉瑕佺敤..鏉ョ渷鐣ワ紝涓嶈澧炲姞杩囧鐨勫洖杞︽敼鍙樺師鏈夋牸寮忥紝杩欐牱浼氬奖鍝嶄唬鐮佺殑鍙鎬э紝濡傛灉浠ｇ爜澶暱涓�鏉″洖澶嶄笉瀹岋紝灏卞洖澶嶅鏉′俊鎭畬鎴怽n${record.sql}`)
+
+ window.open('#/ai')
+
+ setTimeout(() => {
+ sessionStorage.removeItem('deepseek_sql')
+ }, 0)
+ }
+ }}>
+ <svg viewBox="0 0 1391 1024" width="20px" fill="currentColor">
+ <path d="M1361.92 83.136c-14.272-7.04-20.416 6.272-28.736 12.992-2.816 2.24-5.248 5.12-7.68 7.68-20.8 22.336-45.056 36.864-76.8 35.136-46.464-2.56-86.08 12.032-121.152 47.616-7.552-43.904-32.256-70.08-69.888-86.912-19.712-8.768-39.68-17.472-53.376-36.48-9.664-13.44-12.288-28.48-17.216-43.264-3.008-8.96-6.08-18.112-16.32-19.712-11.2-1.728-15.552 7.68-19.968 15.424-17.536 32.128-24.32 67.52-23.68 103.296 1.6 80.448 35.52 144.576 103.04 190.144 7.68 5.312 9.6 10.56 7.168 18.176-4.608 15.68-10.048 30.976-14.912 46.592-3.072 10.112-7.68 12.352-18.304 8a308.224 308.224 0 0 1-97.28-66.176c-48-46.4-91.392-97.664-145.472-137.792a655.36 655.36 0 0 0-38.528-26.432c-55.232-53.76 7.232-97.792 21.632-103.04 15.104-5.376 5.312-24.128-43.52-23.936C652.032 24.704 607.36 41.024 550.4 62.72a156.8 156.8 0 0 1-26.048 7.68 542.016 542.016 0 0 0-161.408-5.696c-105.6 11.904-189.888 61.824-251.904 147.2C36.608 314.24 19.072 430.848 40.512 552.32c22.528 128 87.808 234.048 188.16 316.992 104 85.888 223.808 128 360.512 120 82.944-4.864 175.424-16 279.68-104.32 26.368 13.056 53.888 18.24 99.712 22.272 35.2 3.328 69.184-1.792 95.424-7.232 41.216-8.704 38.4-46.848 23.424-53.888-120.576-56.32-94.208-33.408-118.272-51.84 61.376-72.768 153.792-148.224 189.952-392.768 2.816-19.392 0.384-31.552 0-47.36-0.256-9.536 1.92-13.312 12.8-14.4a231.04 231.04 0 0 0 86.592-26.56c78.272-42.88 109.696-113.024 117.184-197.184 1.088-12.928-0.256-26.24-13.76-32.96z m-681.408 757.76c-116.928-92.096-173.696-122.368-197.12-120.96-21.888 1.152-17.984 26.304-13.184 42.624 5.12 16.128 11.648 27.328 20.8 41.408 6.464 9.408 10.752 23.424-6.272 33.92-37.76 23.424-103.232-7.872-106.24-9.472-76.288-44.8-140.032-104.192-184.96-185.344-43.264-78.08-68.48-161.92-72.576-251.328-1.152-21.632 5.184-29.312 26.688-33.152a265.6 265.6 0 0 1 85.696-2.24c119.296 17.472 220.928 71.04 306.048 155.52 48.768 48.32 85.504 105.92 123.392 162.176 40.256 59.776 83.648 116.672 138.88 163.392 19.392 16.32 35.072 28.8 49.92 37.952-44.928 5.056-119.872 6.08-171.008-34.496z m56.064-361.024a17.152 17.152 0 1 1 2.752 9.6 16.896 16.896 0 0 1-2.752-9.664z m174.08 89.472a102.72 102.72 0 0 1-33.024 8.96 70.528 70.528 0 0 1-44.736-14.272c-15.296-12.8-26.176-19.968-30.848-42.496a99.264 99.264 0 0 1 0.832-32.96c4.032-18.368-0.384-30.08-13.248-40.768-10.624-8.768-23.872-11.072-38.592-11.072a31.168 31.168 0 0 1-14.272-4.416c-6.144-3.072-11.136-10.752-6.336-20.16 1.536-3.008 8.96-10.304 10.752-11.712 19.84-11.328 42.88-7.68 64.192 0.896 19.712 8.064 34.56 22.848 56 43.776 21.952 25.28 25.792 32.384 38.4 51.328 9.856 14.848 18.816 30.208 24.96 47.616 3.776 10.88-1.152 19.776-14.08 25.28z"></path>
+ </svg>
+ </span>
</div>)
}
],
@@ -487,6 +502,21 @@
}>
<span className="operation-btn" style={{color: '#ff4d4f'}}><DeleteOutlined /></span>
</Popconfirm>
+ <span className="anticon operation-btn" style={{color: '#4D6BFE'}} onClick={() => {
+ if (record.sql) {
+ sessionStorage.setItem('deepseek_sql', `瀵逛互涓媠ql server鑴氭湰锛岀紪鍐欐敞閲婏紝涓嶈兘鐢�--锛屽彧鑳界敤/**/ 锛孈bid@鏄笂绾х粍浠秈d,@id@鏄綋鍓嶈鏁版嵁id锛孈userid@涓哄綋鍓嶇櫥褰曠敤鎴穒d锛屾墍鏈夊瓧娈典笉瑕佺敤..鏉ョ渷鐣ワ紝涓嶈澧炲姞杩囧鐨勫洖杞︽敼鍙樺師鏈夋牸寮忥紝杩欐牱浼氬奖鍝嶄唬鐮佺殑鍙鎬э紝濡傛灉浠ｇ爜澶暱涓�鏉″洖澶嶄笉瀹岋紝灏卞洖澶嶅鏉′俊鎭畬鎴怽n${record.sql}`)
+
+ window.open('#/ai')
+
+ setTimeout(() => {
+ sessionStorage.removeItem('deepseek_sql')
+ }, 0)
+ }
+ }}>
+ <svg viewBox="0 0 1391 1024" width="20px" fill="currentColor">
+ <path d="M1361.92 83.136c-14.272-7.04-20.416 6.272-28.736 12.992-2.816 2.24-5.248 5.12-7.68 7.68-20.8 22.336-45.056 36.864-76.8 35.136-46.464-2.56-86.08 12.032-121.152 47.616-7.552-43.904-32.256-70.08-69.888-86.912-19.712-8.768-39.68-17.472-53.376-36.48-9.664-13.44-12.288-28.48-17.216-43.264-3.008-8.96-6.08-18.112-16.32-19.712-11.2-1.728-15.552 7.68-19.968 15.424-17.536 32.128-24.32 67.52-23.68 103.296 1.6 80.448 35.52 144.576 103.04 190.144 7.68 5.312 9.6 10.56 7.168 18.176-4.608 15.68-10.048 30.976-14.912 46.592-3.072 10.112-7.68 12.352-18.304 8a308.224 308.224 0 0 1-97.28-66.176c-48-46.4-91.392-97.664-145.472-137.792a655.36 655.36 0 0 0-38.528-26.432c-55.232-53.76 7.232-97.792 21.632-103.04 15.104-5.376 5.312-24.128-43.52-23.936C652.032 24.704 607.36 41.024 550.4 62.72a156.8 156.8 0 0 1-26.048 7.68 542.016 542.016 0 0 0-161.408-5.696c-105.6 11.904-189.888 61.824-251.904 147.2C36.608 314.24 19.072 430.848 40.512 552.32c22.528 128 87.808 234.048 188.16 316.992 104 85.888 223.808 128 360.512 120 82.944-4.864 175.424-16 279.68-104.32 26.368 13.056 53.888 18.24 99.712 22.272 35.2 3.328 69.184-1.792 95.424-7.232 41.216-8.704 38.4-46.848 23.424-53.888-120.576-56.32-94.208-33.408-118.272-51.84 61.376-72.768 153.792-148.224 189.952-392.768 2.816-19.392 0.384-31.552 0-47.36-0.256-9.536 1.92-13.312 12.8-14.4a231.04 231.04 0 0 0 86.592-26.56c78.272-42.88 109.696-113.024 117.184-197.184 1.088-12.928-0.256-26.24-13.76-32.96z m-681.408 757.76c-116.928-92.096-173.696-122.368-197.12-120.96-21.888 1.152-17.984 26.304-13.184 42.624 5.12 16.128 11.648 27.328 20.8 41.408 6.464 9.408 10.752 23.424-6.272 33.92-37.76 23.424-103.232-7.872-106.24-9.472-76.288-44.8-140.032-104.192-184.96-185.344-43.264-78.08-68.48-161.92-72.576-251.328-1.152-21.632 5.184-29.312 26.688-33.152a265.6 265.6 0 0 1 85.696-2.24c119.296 17.472 220.928 71.04 306.048 155.52 48.768 48.32 85.504 105.92 123.392 162.176 40.256 59.776 83.648 116.672 138.88 163.392 19.392 16.32 35.072 28.8 49.92 37.952-44.928 5.056-119.872 6.08-171.008-34.496z m56.064-361.024a17.152 17.152 0 1 1 2.752 9.6 16.896 16.896 0 0 1-2.752-9.664z m174.08 89.472a102.72 102.72 0 0 1-33.024 8.96 70.528 70.528 0 0 1-44.736-14.272c-15.296-12.8-26.176-19.968-30.848-42.496a99.264 99.264 0 0 1 0.832-32.96c4.032-18.368-0.384-30.08-13.248-40.768-10.624-8.768-23.872-11.072-38.592-11.072a31.168 31.168 0 0 1-14.272-4.416c-6.144-3.072-11.136-10.752-6.336-20.16 1.536-3.008 8.96-10.304 10.752-11.712 19.84-11.328 42.88-7.68 64.192 0.896 19.712 8.064 34.56 22.848 56 43.776 21.952 25.28 25.792 32.384 38.4 51.328 9.856 14.848 18.816 30.208 24.96 47.616 3.776 10.88-1.152 19.776-14.08 25.28z"></path>
+ </svg>
+ </span>
</div>)
}
],
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..7c64c42 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 || ''}','${item.allow_subscribe || ''}'`
})
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 || ''}','${item.allow_subscribe || ''}'`
})
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 || ''}','${item.allow_subscribe || ''}'`
})
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..f6c26a1 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 || '' : '',
@@ -360,6 +380,23 @@
)}
</Form.Item>
</Col> : null}
+ <Col span={12}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="鏄惁鍏佽鍦ㄥ叾浠栧簲鐢ㄤ腑鎵撳紑銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 璁㈤槄
+ </Tooltip>
+ }>
+ {getFieldDecorator('allow_subscribe', {
+ initialValue: card ? card.allow_subscribe || '' : ''
+ })(
+ <Radio.Group>
+ <Radio value="">鍏抽棴</Radio>
+ <Radio value="Y">寮�鍚�</Radio>
+ </Radio.Group>
+ )}
+ </Form.Item>
+ </Col>
{typename !== 'pc' ? <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="鍦ㄤ娇鐢ㄥ皬绋嬪簭鎴栨槑绉戜簯APP鏃讹紙app妯″紡涓級鏃犳晥">
--
Gitblit v1.8.0