From af712daea6f5ebeeb7fd550c7fe4cee118c80d54 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 23 十一月 2023 14:42:05 +0800
Subject: [PATCH] 2023-11-23
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 4 ++++
src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx | 2 +-
src/tabviews/custom/components/code/sand-box/index.jsx | 4 ++--
src/tabviews/custom/components/share/normalTable/index.jsx | 2 ++
src/menu/stylecontroller/index.jsx | 19 ++++++++++++++++++-
src/menu/components/code/sandbox/editorcode/index.jsx | 2 +-
src/menu/components/card/doublecardcomponent/index.jsx | 2 +-
src/menu/components/card/cardcomponent/index.jsx | 2 +-
8 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/src/menu/components/card/cardcomponent/index.jsx b/src/menu/components/card/cardcomponent/index.jsx
index 2e45d8c..fec3526 100644
--- a/src/menu/components/card/cardcomponent/index.jsx
+++ b/src/menu/components/card/cardcomponent/index.jsx
@@ -157,7 +157,7 @@
const { card, side } = this.state
let _style = null
- let options = ['height', 'background', 'border', 'padding', 'margin', 'shadow', 'clear']
+ let options = ['height', 'background', 'border', 'padding', 'margin', 'shadow', 'clear', 'overflow']
if (side === 'front') {
_style = card.style ? fromJS(card.style).toJS() : {}
} else if (side === 'back') {
diff --git a/src/menu/components/card/doublecardcomponent/index.jsx b/src/menu/components/card/doublecardcomponent/index.jsx
index 98acc31..cc2e64a 100644
--- a/src/menu/components/card/doublecardcomponent/index.jsx
+++ b/src/menu/components/card/doublecardcomponent/index.jsx
@@ -122,7 +122,7 @@
const { card } = this.state
let _style = null
- let options = ['height', 'background', 'border', 'padding', 'margin', 'shadow']
+ let options = ['height', 'background', 'border', 'padding', 'margin', 'shadow', 'overflow']
if (type === 'sub') {
_style = fromJS(card.backStyle).toJS()
diff --git a/src/menu/components/code/sandbox/editorcode/index.jsx b/src/menu/components/code/sandbox/editorcode/index.jsx
index 45acab3..d03991d 100644
--- a/src/menu/components/code/sandbox/editorcode/index.jsx
+++ b/src/menu/components/code/sandbox/editorcode/index.jsx
@@ -34,7 +34,7 @@
visible: true,
html: config.html || '',
css: config.css || '',
- js: config.js || '',
+ js: config.js || '// Function(data, result, Api, notification, systemType) data-鏁版嵁鍒楄〃锛宺esult-鏌ヨ鎺ュ彛杩斿洖缁撴灉锛孉pi-鎺ュ彛锛宯otification-淇℃伅鎻愮ず鎺т欢锛堢Щ鍔ㄧ涓篢oast锛夛紝systemType-绯荤粺绫诲瀷锛堟寮忎负 production锛屾祴璇曚负绌猴級',
})
}
diff --git a/src/menu/stylecontroller/index.jsx b/src/menu/stylecontroller/index.jsx
index b2e0d63..89f5ca9 100644
--- a/src/menu/stylecontroller/index.jsx
+++ b/src/menu/stylecontroller/index.jsx
@@ -29,7 +29,8 @@
ArrowRightOutlined,
SwapOutlined,
EnterOutlined,
- DragOutlined
+ DragOutlined,
+ EyeOutlined
} from '@ant-design/icons'
import MKEmitter from '@/utils/events.js'
@@ -521,6 +522,8 @@
delete style.right
} else if (n === 'transform') {
delete style.transform
+ } else if (n === 'overflow') {
+ delete style.overflow
}
})
}
@@ -1075,6 +1078,20 @@
</Form.Item>
</Col>
</Panel> : null}
+ {options.includes('overflow') ? <Panel header="婧㈠嚭" key="overflow">
+ <Col span={24}>
+ <Form.Item
+ colon={false}
+ label={<EyeOutlined title="婧㈠嚭"/>}
+ labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
+ >
+ <Radio.Group style={{whiteSpace: 'nowrap'}} defaultValue={card.overflow || 'hidden'} onChange={(e) => this.changeNormalStyle(e.target.value, 'overflow')}>
+ <Radio value="hidden">闅愯棌</Radio>
+ <Radio value="visible">鏄剧ず</Radio>
+ </Radio.Group>
+ </Form.Item>
+ </Col>
+ </Panel> : null}
{options.includes('position') ? <Panel header="瀹氫綅" key="position">
<div style={{paddingLeft: '35px', fontSize: '12px'}}>娉細瀹氫綅鏁堟灉璇峰湪杩愯鐜涓煡鐪嬨��</div>
<Col span={24}>
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 9e1377f..4a1e085 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -654,6 +654,10 @@
if (card.link) {
_style.cursor = 'pointer'
}
+
+ if (_style.position === 'absolute') {
+ _style.width = '100%'
+ }
let scale = url && card.scale === 'true'
let urls = url ? url.split(',').filter(Boolean) : ['']
diff --git a/src/tabviews/custom/components/code/sand-box/index.jsx b/src/tabviews/custom/components/code/sand-box/index.jsx
index d5b40b7..bc158d3 100644
--- a/src/tabviews/custom/components/code/sand-box/index.jsx
+++ b/src/tabviews/custom/components/code/sand-box/index.jsx
@@ -318,8 +318,8 @@
if (js) {
try {
// eslint-disable-next-line
- let evalfunc = eval('(true && function (data, result, Api, notification) {' + js + '})')
- evalfunc(data, result, Api, notification)
+ let evalfunc = eval('(true && function (data, result, Api, notification, systemType) {' + js + '})')
+ evalfunc(data, result, Api, notification, window.GLOB.systemType)
} catch (e) {
console.warn(e)
}
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 840b824..905d316 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -838,6 +838,8 @@
onSelectChange = (selectedRowKeys, e) => {
const { setting, MenuID, data } = this.props
+ if (this.state.pickup) return
+
let index = ''
let _activeIndex = null
if (selectedRowKeys.length > 0) {
diff --git a/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx
index 2d94432..827c5af 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx
@@ -270,7 +270,7 @@
dataType: _verify.dataType || 'line',
linkType: _verify.linkType,
printMode: _verify.printMode,
- printFunc: _verify.printFunc || '// Function(data, form, printer, notification) data-鎵撳嵃鏁版嵁鍒楄〃锛宖orm-琛ㄥ崟淇℃伅锛堜笉瀛樺湪鏃朵负{}锛夛紝printer-鎵撳嵃璁剧疆锛宯otification-淇℃伅鎻愮ず鎺т欢锛宑allback-閲婃斁鎸夐挳鐨勫洖璋�'
+ printFunc: _verify.printFunc || '// Function(data, form, printer, notification, Api, systemType, callback) data-鎵撳嵃鏁版嵁鍒楄〃锛宖orm-琛ㄥ崟淇℃伅锛堜笉瀛樺湪鏃朵负{}锛夛紝printer-鎵撳嵃璁剧疆锛宯otification-淇℃伅鎻愮ず鎺т欢锛堢Щ鍔ㄧ涓篢oast锛夛紝Api-鎺ュ彛锛宻ystemType-绯荤粺绫诲瀷锛堟寮忎负 production锛屾祴璇曚负绌猴級锛宑allback-閲婃斁鎸夐挳鐨勫洖璋�'
})
}
--
Gitblit v1.8.0