From 10505e3f2b515a9e0c94496b2bc8340316863d64 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 11 一月 2022 09:39:34 +0800
Subject: [PATCH] 2022-01-11
---
src/tabviews/treepage/index.jsx | 6 ++++--
src/menu/components/card/cardcomponent/menus-wrap/index.jsx | 5 +++++
src/tabviews/custom/components/card/prop-card/index.jsx | 12 +++++-------
src/menu/components/card/data-card/options.jsx | 2 +-
src/views/pcdesign/index.jsx | 4 ++++
src/views/mobdesign/index.jsx | 3 +++
src/menu/components/card/cardcomponent/options.jsx | 2 +-
src/views/menudesign/index.jsx | 4 ++++
src/menu/components/card/cardcomponent/index.jsx | 10 +++++++++-
9 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/src/menu/components/card/cardcomponent/index.jsx b/src/menu/components/card/cardcomponent/index.jsx
index 0fba068..6dbb4eb 100644
--- a/src/menu/components/card/cardcomponent/index.jsx
+++ b/src/menu/components/card/cardcomponent/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Popover, Switch, Col, Modal, Button } from 'antd'
+import { Popover, Switch, Col, Modal, Button, notification } from 'antd'
import { PlusOutlined, PlusSquareOutlined, EditOutlined, ArrowLeftOutlined, ArrowRightOutlined, SwapOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
@@ -272,6 +272,14 @@
const { card, appType } = this.state
if (card.setting.click === 'menu' && card.setting.menu) {
+ if (['IM'].includes(card.setting.menu)) {
+ notification.warning({
+ top: 92,
+ message: '绯荤粺椤甸潰涓嶅彲缂栬緫锛�',
+ duration: 5
+ })
+ return
+ }
MKEmitter.emit('changeEditMenu', {MenuID: card.setting.menu})
} else if (card.setting.click === 'menus' && card.menus && card.menus.length > 0 && cards.subtype === 'datacard' && card.$cardType !== 'extendCard' && (appType === 'mob' || appType === 'pc')) {
this.setState({visible: true})
diff --git a/src/menu/components/card/cardcomponent/menus-wrap/index.jsx b/src/menu/components/card/cardcomponent/menus-wrap/index.jsx
index 47dc40a..72d3457 100644
--- a/src/menu/components/card/cardcomponent/menus-wrap/index.jsx
+++ b/src/menu/components/card/cardcomponent/menus-wrap/index.jsx
@@ -39,6 +39,11 @@
} else {
menulist = []
}
+ if (appType === 'mob') {
+ menulist.push({
+ value: 'IM', label: '鍗虫椂閫氫俊锛堢郴缁熼〉锛�'
+ })
+ }
} else {
menulist = sessionStorage.getItem('fstMenuList')
if (menulist) {
diff --git a/src/menu/components/card/cardcomponent/options.jsx b/src/menu/components/card/cardcomponent/options.jsx
index ab83bf7..cdd3e50 100644
--- a/src/menu/components/card/cardcomponent/options.jsx
+++ b/src/menu/components/card/cardcomponent/options.jsx
@@ -19,7 +19,7 @@
} else {
appmenulist = []
}
- if (appType === 'mob' && hasMenus) { // 鏁版嵁鍗″彲鎵撳紑鍗虫椂閫氫俊
+ if (appType === 'mob' && (subtype === 'datacard' || subtype === 'propcard') && cardType !== 'extendCard') { // 鏁版嵁鍗″彲鎵撳紑鍗虫椂閫氫俊
appmenulist.push({
value: 'IM', label: '鍗虫椂閫氫俊锛堢郴缁熼〉锛�'
})
diff --git a/src/menu/components/card/data-card/options.jsx b/src/menu/components/card/data-card/options.jsx
index b2d3134..7d8ef6a 100644
--- a/src/menu/components/card/data-card/options.jsx
+++ b/src/menu/components/card/data-card/options.jsx
@@ -103,7 +103,7 @@
{field: 'checkAll', values: ['checkbox']},
{field: 'selected', values: ['radio', 'checkbox']},
{field: 'selStyle', values: ['radio', 'checkbox']},
- {field: 'priKeyType', values: ['radio', 'checkbox']},
+ // {field: 'priKeyType', values: ['radio', 'checkbox']},
],
forbid: subtype === 'tablecard'
},
diff --git a/src/tabviews/custom/components/card/prop-card/index.jsx b/src/tabviews/custom/components/card/prop-card/index.jsx
index a347b8e..e4dc898 100644
--- a/src/tabviews/custom/components/card/prop-card/index.jsx
+++ b/src/tabviews/custom/components/card/prop-card/index.jsx
@@ -43,7 +43,7 @@
let _data = { $$empty: true }
let _sync = false
- if (_config.setting && _config.wrap.datatype !== 'static') {
+ if (_config.wrap.datatype !== 'static') {
_sync = _config.setting.sync === 'true'
if (_sync && data) {
@@ -64,7 +64,7 @@
if (_data) {
_data.$$BID = BID || ''
_data.$$BData = BData || ''
- if (_config.setting && _config.setting.primaryKey) {
+ if (_config.setting.primaryKey) {
_data.$$uuid = _data[_config.setting.primaryKey] || ''
}
}
@@ -101,7 +101,7 @@
})
let offset = 0
- if (_config.wrap.cardFloat && _config.wrap.cardFloat !== 'left' && _config.subcards[0] && _width < 24) {
+ if (_config.wrap.cardFloat && _config.wrap.cardFloat !== 'left' && _width < 24) {
offset = 24 - _width
if (_config.wrap.cardFloat === 'center') {
offset = Math.floor(offset / 2)
@@ -126,7 +126,7 @@
config: _config,
arr_field: _config.columns.map(col => col.field).join(','),
}, () => {
- if (_config.wrap.datatype !== 'static' && _config.setting && _config.setting.sync !== 'true' && _config.setting.onload === 'true') {
+ if (_config.wrap.datatype !== 'static' && _config.setting.sync !== 'true' && _config.setting.onload === 'true') {
this.loadData()
} else if ((!_sync || _config.wrap.priKeyType === 'static') && selected !== 'false') {
setTimeout(() => {
@@ -192,8 +192,6 @@
checkTopLine = () => {
const { config, data, selected } = this.state
-
- if (!config.subcards[0]) return
this.setState({
activeKey: 0,
@@ -288,7 +286,7 @@
resetParentParam = (MenuID, id, data) => {
const { config } = this.state
- if (!config.setting || !config.setting.supModule || config.setting.supModule !== MenuID) return
+ if (!config.setting.supModule || config.setting.supModule !== MenuID) return
if (id !== this.state.BID || id !== '') {
this.setState({ BID: id, BData: data }, () => {
this.loadData()
diff --git a/src/tabviews/treepage/index.jsx b/src/tabviews/treepage/index.jsx
index 8f3e22c..936dac9 100644
--- a/src/tabviews/treepage/index.jsx
+++ b/src/tabviews/treepage/index.jsx
@@ -51,7 +51,8 @@
revertLoading: false, // 鎭㈠榛樿璁剧疆
expandedKeys: [], // 灞曞紑鐨勬爲鑺傜偣
selectedKeys: [], // 閫変腑鐨勬爲鑺傜偣
- shortcuts: null // 蹇嵎閿�
+ shortcuts: null, // 蹇嵎閿�
+ searchKey: ''
}
/**
@@ -470,7 +471,8 @@
BIDs: {},
shortcuts: null,
expandedKeys: [],
- selectedKeys: []
+ selectedKeys: [],
+ searchKey: ''
}, () => {
this.loadconfig()
})
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index 822ab39..66e4dc9 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -931,7 +931,11 @@
} else if (item.type === 'group') {
check(item.components)
return
+ } else if (item.subtype === 'propcard' && item.subcards.length === 0) {
+ error = `缁勪欢銆�${item.name}銆嬩腑鍗＄墖涓嶅彲涓虹┖锛乣
+ return
}
+
if (['propcard', 'brafteditor', 'sandbox', 'stepform', 'tabform'].includes(item.subtype) && item.wrap.datatype === 'static') return
if (['balcony'].includes(item.type) && item.wrap.datatype === 'static') return
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index a8e1e13..4e4ed5b 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -1274,6 +1274,9 @@
if (!item.wrap.field) {
error = `鎼滅储鏉′欢銆�${item.name}銆嬫湭璁剧疆鎼滅储瀛楁锛乣
}
+ } else if (item.subtype === 'propcard' && item.subcards.length === 0) {
+ error = `缁勪欢銆�${item.name}銆嬩腑鍗＄墖涓嶅彲涓虹┖锛乣
+ return
}
if (item.wrap && item.wrap.pagestyle === 'slide') {
swipes.push(item.name)
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index d78d938..be624a1 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -1476,7 +1476,11 @@
} else if (item.type === 'group') {
check(item.components)
return
+ } else if (item.subtype === 'propcard' && item.subcards.length === 0) {
+ error = `缁勪欢銆�${item.name}銆嬩腑鍗＄墖涓嶅彲涓虹┖锛乣
+ return
}
+
if (['propcard', 'brafteditor', 'sandbox', 'stepform', 'tabform'].includes(item.subtype) && item.wrap.datatype === 'static') return
if (['balcony'].includes(item.type) && item.wrap.datatype === 'static') return
--
Gitblit v1.8.0