From 29432c9167e3fcdf83f35d0bb9dbe9acb7c7ffbf Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 22 六月 2021 14:35:23 +0800
Subject: [PATCH] 2021-06-22
---
src/views/pcdesign/index.jsx | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index 183c884..6528b49 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -8,7 +8,7 @@
import { ConfigProvider, notification, Modal, Collapse, Switch, Button, Icon, message, Spin } from 'antd'
import Api from '@/api'
-import Utils from '@/utils/utils.js'
+import Utils, { setGLOBFuncs } from '@/utils/utils.js'
import zhCN from '@/locales/zh-CN/mob.js'
import enUS from '@/locales/en-US/mob.js'
import antdEnUS from 'antd/es/locale/en_US'
@@ -25,6 +25,7 @@
const MenuForm = asyncComponent(() => import('./menuform'))
const MenuShell = asyncComponent(() => import('@/pc/menushell'))
const SourceWrap = asyncComponent(() => import('@/pc/modulesource'))
+const CreateView = asyncComponent(() => import('@/pc/createview'))
const BgController = asyncComponent(() => import('@/pc/bgcontroller'))
const Quotecomponent = asyncComponent(() => import('@/pc/quotecomponent'))
const PasteController = asyncComponent(() => import('@/menu/pastecontroller'))
@@ -40,6 +41,7 @@
sessionStorage.setItem('isEditState', 'true')
sessionStorage.setItem('editMenuType', 'menu') // 缂栬緫鑿滃崟绫诲瀷
sessionStorage.setItem('appType', 'pc') // 搴旂敤绫诲瀷
+sessionStorage.setItem('typename', 'pc')
document.body.className = ''
window.GLOB.UserComponentMap = new Map() // 缂撳瓨鐢ㄦ埛鑷畾涔夌粍浠�
window.GLOB.CacheIndependent = new Map()
@@ -77,7 +79,6 @@
sessionStorage.setItem('appId', param.ID || '')
sessionStorage.setItem('lang', param.lang || 'zh-CN')
sessionStorage.setItem('kei_no', param.kei_no || '')
- sessionStorage.setItem('link_type', param.link_type || 'true')
sessionStorage.setItem('role_type', param.role_type || 'true')
sessionStorage.setItem('login_types', param.login_types || 'true')
@@ -128,6 +129,7 @@
this.updateCustomComponent()
this.getAppPictures()
this.getSmStemp()
+ setGLOBFuncs()
}, 1000)
}
@@ -165,9 +167,6 @@
type: 'view'
}
- if (menu.fixed && menu.MenuNo && menu.MenuName) {
- param.fixed = true
- }
param.MenuNo = menu.MenuNo || ''
param.MenuName = menu.MenuName || ''
@@ -251,7 +250,9 @@
}
getSmStemp = () => {
- let _sql = `select ID,TemplateCode,SignName from bd_msn_sms_temp where deleted=0 and appkey='${window.GLOB.appkey}'`
+ let _sql = `select ID,TemplateCode,SignName from (select * from bd_msn_sms_temp where deleted=0 and status=20 ) a
+ inner join (select openid from sapp where id='${window.GLOB.appkey}') b
+ on a.openid=b.openid`
_sql = Utils.formatOptions(_sql)
@@ -501,10 +502,6 @@
config.open_edition = result.open_edition || ''
window.GLOB.urlFields = config.urlFields || []
- if (urlParam.fixed && urlParam.MenuNo && urlParam.MenuName) {
- config.fixed = true
- }
-
let indeComs = []
config.components.forEach(item => {
if (item.type === 'navbar') {
@@ -619,6 +616,8 @@
config.uuid = MenuId
config.MenuID = MenuId
config.open_edition = ''
+ config.MenuName = urlParam.MenuName || ''
+ config.MenuNo = urlParam.MenuNo || ''
let indeComs = []
config.components.forEach(item => {
@@ -1044,21 +1043,21 @@
})
if (appViewList.length > _length) {
- let param = {
+ let kparam = {
func: 's_kei_link_keyids_addupt',
BID: sessionStorage.getItem('appId'),
exec_type: 'y',
LText: ''
}
- param.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
- param.LText = param.LText.join(' union all ')
- param.LText = Utils.formatOptions(param.LText)
+ kparam.LText = appViewList.map(item => `select '${item.keys_id}','${item.keys_type}','${item.kei_no}','${item.appkey}','${item.bid}','${sessionStorage.getItem('CloudUserID')}','${item.remark}'`)
+ kparam.LText = kparam.LText.join(' union all ')
+ kparam.LText = Utils.formatOptions(kparam.LText)
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt('', param.timestamp)
+ kparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ kparam.secretkey = Utils.encrypt('', kparam.timestamp)
- Api.getSystemConfig(param).then(result => {
+ Api.getSystemConfig(kparam).then(result => {
if (!result.status) {
notification.warning({
top: 92,
@@ -1329,7 +1328,7 @@
check(item.components)
return
}
- if (['propcard', 'brafteditor', 'sandbox'].includes(item.subtype) && item.wrap.datatype === 'static') return
+ if (['propcard', 'brafteditor', 'sandbox', 'stepform'].includes(item.subtype) && item.wrap.datatype === 'static') return
if (item.setting) {
if (item.setting.interType === 'system' && item.setting.execute !== 'false' && !item.setting.dataresource) {
@@ -1513,6 +1512,7 @@
</div>
<Button type="primary" onClick={this.submitConfig} loading={menuloading}>{dict['mob.save']}</Button>
<Switch className="big" checkedChildren={dict['mob.enable']} unCheckedChildren={dict['mob.disable']} checked={config && config.enabled} onChange={this.onEnabledChange} />
+ <CreateView resetmenu={this.getAppMenus} />
<PasteController type="menu" Tab={null} insert={this.insert} />
<StyleCombControlButton menu={config} />
<SysInterface config={config} updateConfig={this.updateConfig}/>
--
Gitblit v1.8.0