From db6d22f5b89d913b1ac0b613ac654ef874e5458a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 10 四月 2022 15:05:57 +0800
Subject: [PATCH] 2022-04-10
---
public/options.json | 14 +++++++-------
src/menu/components/card/balcony/index.jsx | 2 +-
src/tabviews/custom/components/card/balcony/index.jsx | 18 +++++++++++++++---
src/views/billprint/index.jsx | 7 +++++++
src/menu/components/card/balcony/options.jsx | 11 ++++-------
src/views/menudesign/index.jsx | 1 -
src/menu/modulesource/option.jsx | 2 +-
7 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/public/options.json b/public/options.json
index f317ad5..792a858 100644
--- a/public/options.json
+++ b/public/options.json
@@ -1,17 +1,17 @@
{
- "appId": "201912040924165801464FF1788654BC5AC73",
- "appkey": "20191106103859640976D6E924E464D029CF0",
+ "appId": "202108312122504607B107A83F55B40C98CCF",
+ "appkey": "20210831212235413F287EC3BF489424496C8",
"mainSystemApi": "http://sso.mk9h.cn/cloud/webapi/dostars",
"systemType": "",
"externalDatabase": "false",
"lineColor": "",
"filter": "false",
- "defaultApp": "mk",
+ "defaultApp": "mkindustry",
"defaultLang": "zh-CN",
"WXAppID": "",
"debugger": false,
- "licenseKey": "",
- "probation": "",
- "host": "http://qingqiumarket.cn",
- "service": "MKWMS/"
+ "licenseKey": "7EFE13KIKLILIJB64C12",
+ "probation": "2021-12-31",
+ "host": "http://demo.mk9h.cn",
+ "service": "erp_new/"
}
\ No newline at end of file
diff --git a/src/menu/components/card/balcony/index.jsx b/src/menu/components/card/balcony/index.jsx
index 7f0823c..08638ca 100644
--- a/src/menu/components/card/balcony/index.jsx
+++ b/src/menu/components/card/balcony/index.jsx
@@ -213,7 +213,7 @@
<div className="mk-popover-control">
<PlusOutlined className="plus" title="娣诲姞鍏冪礌" onClick={this.addElement} />
<PlusSquareOutlined className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton} />
- <NormalForm title="娴姩鍗¤缃�" width={800} update={this.updateWrap} getForms={this.getWrapForms}>
+ <NormalForm title="娴姩鍗¤缃�" width={850} update={this.updateWrap} getForms={this.getWrapForms}>
<EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
</NormalForm>
<CopyComponent type="balcony" card={card}/>
diff --git a/src/menu/components/card/balcony/options.jsx b/src/menu/components/card/balcony/options.jsx
index 1308685..bee1eb8 100644
--- a/src/menu/components/card/balcony/options.jsx
+++ b/src/menu/components/card/balcony/options.jsx
@@ -118,20 +118,17 @@
field: 'position',
label: '浣嶇疆',
initval: wrap.position || 'relative',
- tooltip: '浣跨敤鍥哄畾瀹氫綅鏃讹紝璇峰湪娴嬭瘯鐜涓煡鐪嬪畾浣嶆晥鏋溿��',
+ tooltip: '鐩稿瀹氫綅鏄浉瀵瑰叾姝ｅ父浣嶇疆鐨勫亸绉伙紱缁濆瀹氫綅鏄浉瀵逛簬鍘熺粍浠剁殑鍋忕Щ锛屽師缁勪欢楂樺害鍙涓�0锛涘浐瀹氬畾浣嶆槸鐩稿浜庣獥鍙ｇ殑浣嶇疆锛屽畾浣嶆晥鏋滄祴璇曠幆澧冧腑鏌ョ湅銆�',
required: false,
options: [
{value: 'relative', label: '鐩稿瀹氫綅'},
+ {value: 'absolute', label: '缁濆瀹氫綅'},
{value: 'fixed', label: '鍥哄畾瀹氫綅'},
],
controlFields: [
{field: 'quick', values: ['fixed']},
- {field: 'top', values: ['fixed']},
- {field: 'right', values: ['fixed']},
- {field: 'bottom', values: ['fixed']},
- {field: 'left', values: ['fixed']},
- {field: 'realwidth', values: ['fixed']},
- {field: 'transform', values: ['fixed']},
+ {field: 'realwidth', values: ['fixed', 'absolute']},
+ {field: 'transform', values: ['fixed', 'absolute']},
]
},
{
diff --git a/src/menu/modulesource/option.jsx b/src/menu/modulesource/option.jsx
index d640262..8368f81 100644
--- a/src/menu/modulesource/option.jsx
+++ b/src/menu/modulesource/option.jsx
@@ -33,7 +33,7 @@
{ type: 'menu', url: Mainsearch, component: 'search', subtype: 'mainsearch', title: '鎼滅储鏉′欢', width: 24, forbid: ['billPrint'] },
{ type: 'menu', url: card1, component: 'card', subtype: 'datacard', title: '鏁版嵁鍗�', width: 24 },
{ type: 'menu', url: card2, component: 'card', subtype: 'propcard', title: '灞炴�у崱', width: 24 },
- { type: 'menu', url: card2, component: 'balcony', subtype: 'balcony', title: '娴姩鍗�', width: 24, forbid: ['billPrint'] },
+ { type: 'menu', url: card2, component: 'balcony', subtype: 'balcony', title: '娴姩鍗�', width: 24},
{ type: 'menu', url: form, component: 'form', subtype: 'stepform', title: '琛ㄥ崟锛堝垎姝ワ級', width: 24, forbid: ['billPrint'] },
{ type: 'menu', url: tabForm, component: 'form', subtype: 'tabform', title: '琛ㄥ崟锛坱ab椤碉級', width: 24, forbid: ['billPrint'] },
{ type: 'menu', url: Carousel, component: 'carousel', subtype: 'datacard', title: '杞挱-鍔ㄦ�佹暟鎹�', width: 24, forbid: ['billPrint'] },
diff --git a/src/tabviews/custom/components/card/balcony/index.jsx b/src/tabviews/custom/components/card/balcony/index.jsx
index fb01441..c92528f 100644
--- a/src/tabviews/custom/components/card/balcony/index.jsx
+++ b/src/tabviews/custom/components/card/balcony/index.jsx
@@ -35,7 +35,7 @@
}
UNSAFE_componentWillMount () {
- const { data, BID } = this.props
+ const { data, BID, initdata } = this.props
let _config = fromJS(this.props.config).toJS()
let _data = { $$empty: true }
@@ -50,6 +50,12 @@
_data = _data[0] || {}
}
_sync = false
+ } else if (_sync && initdata) {
+ _data = initdata
+ if (Array.isArray(_data)) {
+ _data = _data[0] || {$$empty: true}
+ }
+ _sync = false
}
}
@@ -57,8 +63,8 @@
_data.$$BID = BID || ''
}
- if (_config.wrap.position === 'fixed') {
- _config.style.position = 'fixed'
+ if (_config.wrap.position === 'fixed' || _config.wrap.position === 'absolute') {
+ _config.style.position = _config.wrap.position
_config.style.zIndex = 2
_config.style.left = _config.wrap.left || ''
_config.style.right = _config.wrap.right || ''
@@ -66,6 +72,12 @@
_config.style.bottom = _config.wrap.bottom || ''
_config.style.transform = _config.wrap.transform || ''
_config.style.width = _config.wrap.realwidth || ''
+ } else {
+ _config.style.zIndex = 2
+ _config.style.left = _config.wrap.left || ''
+ _config.style.right = _config.wrap.right || ''
+ _config.style.top = _config.wrap.top || ''
+ _config.style.bottom = _config.wrap.bottom || ''
}
let show = true
diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index 01b87ed..4f00a98 100644
--- a/src/views/billprint/index.jsx
+++ b/src/views/billprint/index.jsx
@@ -25,6 +25,7 @@
const NormalTable = asyncComponent(() => import('@/tabviews/custom/components/table/normal-table'))
const SandBox = asyncComponent(() => import('@/tabviews/custom/components/code/sand-box'))
const TimeLine = asyncComponent(() => import('@/tabviews/custom/components/timeline/normal-timeline'))
+const Balcony = asyncComponent(() => import('@/tabviews/custom/components/card/balcony'))
class BillPrint extends Component {
state = {
@@ -701,6 +702,12 @@
<SandBox config={item} initdata={item.data} mainSearch={[]} menuType="" />
</Col>
)
+ } else if (item.type === 'balcony') {
+ return (
+ <Col span={item.width} key={item.uuid}>
+ <Balcony config={item} initdata={item.data} menuType="" />
+ </Col>
+ )
} else if (item.type === 'timeline') {
return (
<Col span={item.width} key={item.uuid}>
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index c914a8e..f07b1fe 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -988,7 +988,6 @@
let forbid = {
tabs: '鏍囩椤�',
search: '鎼滅储鏉′欢',
- balcony: '娴姩鍗�',
form: '琛ㄥ崟',
carousel: '杞挱',
tree: '鏍戝舰鍒楄〃',
--
Gitblit v1.8.0