From ff2ba12cdcc4ece62154e561d5877eb63f81eba6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 13 七月 2024 23:27:22 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/form/simple-form/index.scss | 11 ---
src/tabviews/custom/components/table/edit-table/index.jsx | 15 +++++
src/mob/searchconfig/index.jsx | 4
src/tabviews/custom/components/table/base-table/index.jsx | 14 ++++
src/views/mobdesign/index.scss | 36 ++++++------
src/mob/modalconfig/index.scss | 1
src/tabviews/custom/components/card/double-data-card/index.jsx | 16 +++++
src/tabviews/custom/components/table/normal-table/index.jsx | 16 +++++
src/tabviews/custom/components/card/data-card/index.jsx | 16 +++++
9 files changed, 93 insertions(+), 36 deletions(-)
diff --git a/src/menu/components/form/simple-form/index.scss b/src/menu/components/form/simple-form/index.scss
index 2615482..a88431e 100644
--- a/src/menu/components/form/simple-form/index.scss
+++ b/src/menu/components/form/simple-form/index.scss
@@ -58,17 +58,6 @@
background-color: transparent;
}
}
- // .form-area.mk-shadow {
- // .mob-form {
- // .am-list-line {
- // border: none!important;
-
- // .am-input-control {
- // background-color: var(--mk-sys-color1);
- // }
- // }
- // }
- // }
}
.menu-simple-form-edit-box::after {
display: block;
diff --git a/src/mob/modalconfig/index.scss b/src/mob/modalconfig/index.scss
index f2a6cef..a08b153 100644
--- a/src/mob/modalconfig/index.scss
+++ b/src/mob/modalconfig/index.scss
@@ -256,7 +256,6 @@
}
}
-
.modal-fields {
.ant-modal {
top: 50px;
diff --git a/src/mob/searchconfig/index.jsx b/src/mob/searchconfig/index.jsx
index 2f7454c..ae16cb1 100644
--- a/src/mob/searchconfig/index.jsx
+++ b/src/mob/searchconfig/index.jsx
@@ -19,7 +19,7 @@
const { Panel } = Collapse
const { confirm } = Modal
const SearchForm = asyncComponent(() => import('@/templates/sharecomponent/searchcomponent/searchform'))
-const PasteComponent = asyncComponent(() => import('./pastecomponent'))
+// const PasteComponent = asyncComponent(() => import('./pastecomponent'))
const DragElement = asyncComponent(() => import('./searchdragelement'))
const GDragElement = asyncComponent(() => import('./groupdragelement'))
const GroupForm = asyncComponent(() => import('./groupform'))
@@ -489,7 +489,7 @@
<Button type="primary" loading={saving} onClick={this.submitConfig}>淇濆瓨</Button>
<Button onClick={this.cancelConfig}>鍏抽棴</Button>
{!group.floor ? <Button onClick={this.returnUp}>杩斿洖涓婄骇</Button> : null}
- <PasteComponent insert={this.insert} />
+ {/* <PasteComponent insert={this.insert} /> */}
<Switch checkedChildren="寮�" unCheckedChildren="鍏�" defaultChecked={this.state.showField} onChange={(val) => this.setState({showField: val})} />
</div>
<div className="setting">
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 3550b7d..7e95542 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Spin, Empty, message, Row, Col, Pagination, Switch } from 'antd'
+import { Spin, Empty, message, Row, Col, Pagination, Switch, notification } from 'antd'
import { DownOutlined } from '@ant-design/icons'
import Api from '@/api'
@@ -1089,6 +1089,20 @@
}
refreshSearch = (list) => {
+ const { config, BID } = this.state
+
+ if (config.setting.supModule && !BID && config.wrap.supKey !== 'false') {
+ notification.warning({
+ top: 92,
+ message: window.GLOB.dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
+ duration: 5
+ })
+ this.setState({
+ search: list
+ })
+ return
+ }
+
this.setState({
search: list,
pageIndex: 1
diff --git a/src/tabviews/custom/components/card/double-data-card/index.jsx b/src/tabviews/custom/components/card/double-data-card/index.jsx
index a3c0682..0275d3b 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Spin, Empty, Row, Col, Pagination, Switch } from 'antd'
+import { Spin, Empty, Row, Col, Pagination, Switch, notification } from 'antd'
import { DownOutlined, UpOutlined, PlusSquareOutlined, MinusSquareOutlined } from '@ant-design/icons'
import Api from '@/api'
@@ -969,6 +969,20 @@
}
refreshSearch = (list) => {
+ const { config, BID } = this.state
+
+ if (config.setting.supModule && !BID && config.wrap.supKey !== 'false') {
+ notification.warning({
+ top: 92,
+ message: window.GLOB.dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
+ duration: 5
+ })
+ this.setState({
+ search: list
+ })
+ return
+ }
+
this.setState({
search: list,
pageIndex: 1
diff --git a/src/tabviews/custom/components/table/base-table/index.jsx b/src/tabviews/custom/components/table/base-table/index.jsx
index 27b2f35..045bf64 100644
--- a/src/tabviews/custom/components/table/base-table/index.jsx
+++ b/src/tabviews/custom/components/table/base-table/index.jsx
@@ -439,7 +439,19 @@
* 鍚湁鍒濆涓嶅姞杞界殑椤甸潰锛屼慨鏀硅缃�
*/
refreshbysearch = (searches) => {
- const { config} = this.state
+ const { config, BID } = this.state
+
+ if (config.setting.supModule && !BID) {
+ notification.warning({
+ top: 92,
+ message: window.GLOB.dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
+ duration: 5
+ })
+ this.setState({
+ search: searches
+ })
+ return
+ }
this.setState({
pageIndex: 1,
diff --git a/src/tabviews/custom/components/table/edit-table/index.jsx b/src/tabviews/custom/components/table/edit-table/index.jsx
index 2b3560d..dae82f3 100644
--- a/src/tabviews/custom/components/table/edit-table/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/index.jsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
+import { notification } from 'antd'
import moment from 'moment'
import Api from '@/api'
@@ -633,6 +634,20 @@
* 鍚湁鍒濆涓嶅姞杞界殑椤甸潰锛屼慨鏀硅缃�
*/
refreshbysearch = (searches) => {
+ const { setting, BID } = this.state
+
+ if (setting.supModule && !BID) {
+ notification.warning({
+ top: 92,
+ message: window.GLOB.dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
+ duration: 5
+ })
+ this.setState({
+ search: searches
+ })
+ return
+ }
+
this.setState({
pageIndex: 1,
search: searches
diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index b689a85..be55ae8 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Collapse } from 'antd'
+import { Collapse, notification } from 'antd'
import moment from 'moment'
import Api from '@/api'
@@ -812,6 +812,20 @@
* 鍚湁鍒濆涓嶅姞杞界殑椤甸潰锛屼慨鏀硅缃�
*/
refreshbysearch = (searches) => {
+ const { setting, BID } = this.state
+
+ if (setting.supModule && !BID && setting.supKey !== 'false') {
+ notification.warning({
+ top: 92,
+ message: window.GLOB.dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
+ duration: 5
+ })
+ this.setState({
+ search: searches
+ })
+ return
+ }
+
this.setState({
pageIndex: 1,
search: searches
diff --git a/src/views/mobdesign/index.scss b/src/views/mobdesign/index.scss
index 0bd4a20..6d6d812 100644
--- a/src/views/mobdesign/index.scss
+++ b/src/views/mobdesign/index.scss
@@ -171,25 +171,25 @@
background-size: 100% 100%;
padding: 25px 13px 40px;
border-radius: 30px;
- .main-search-edit-list {
- .page-card > div > .ant-form-item {
- display: flex;
- >.ant-form-item-label {
- width: 70px;
- }
- >.ant-form-item-control-wrapper {
- flex: 1;
- }
- .ant-form-item-label > label::after {
- content: ' ';
+ // .main-search-edit-list {
+ // .page-card > div > .ant-form-item {
+ // display: flex;
+ // >.ant-form-item-label {
+ // width: 70px;
+ // }
+ // >.ant-form-item-control-wrapper {
+ // flex: 1;
+ // }
+ // .ant-form-item-label > label::after {
+ // content: ' ';
- }
- }
- .page-card.date .ant-form-item, .page-card.datemonth .ant-form-item {
- // box-shadow: 0px 1px 1px #f0f0f0;
- border-bottom: 1px solid #f0f0f0;
- }
- }
+ // }
+ // }
+ // .page-card.date .ant-form-item, .page-card.datemonth .ant-form-item {
+ // // box-shadow: 0px 1px 1px #f0f0f0;
+ // border-bottom: 1px solid #f0f0f0;
+ // }
+ // }
}
.menu-control {
position: fixed;
--
Gitblit v1.8.0