From 36c87081ffdd7719ac3fcada1fb511a372b31b99 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 09 八月 2023 11:44:07 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/card/data-card/options.jsx | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/src/menu/components/card/data-card/options.jsx b/src/menu/components/card/data-card/options.jsx
index 0be3642..37be9fa 100644
--- a/src/menu/components/card/data-card/options.jsx
+++ b/src/menu/components/card/data-card/options.jsx
@@ -62,6 +62,10 @@
}
}
+ if (wrap.datatype === 'public' && MenuType === 'billPrint') {
+ wrap.datatype = 'static'
+ }
+
const cardWrapForm = [
{
type: 'text',
@@ -99,7 +103,7 @@
options: [
{value: 'dynamic', label: '鍔ㄦ��', priKeyType: 'static'},
{value: 'static', label: '闈欐��', priKeyType: 'static'},
- {value: 'public', label: '鍏叡鏁版嵁婧�', priKeyType: 'static'},
+ {value: 'public', label: '鍏叡鏁版嵁婧�', priKeyType: 'static', disabled: MenuType === 'billPrint'},
],
linkFields: ['priKeyType'],
controlFields: [
@@ -279,18 +283,6 @@
],
forbid: subtype === 'tablecard'
},
- // {
- // type: 'radio',
- // field: 'checkAll',
- // label: '鍏ㄩ��',
- // initval: wrap.checkAll || 'hidden',
- // required: false,
- // options: [
- // {value: 'hidden', label: '闅愯棌'},
- // {value: 'show', label: '鏄剧ず'},
- // ],
- // forbid: subtype !== 'datacard' || appType !== 'mob'
- // },
{
type: 'radio',
field: 'cardFloat',
@@ -336,10 +328,10 @@
field: 'printType',
label: '缁勪欢绫诲瀷',
initval: wrap.printType || 'content',
- tooltip: '閫夋嫨绫诲瀷涓恒�婇〉鐪�/椤佃剼銆嬫椂锛屾墦鍗扮殑姣忛〉閲岄兘浼氬甫鏈夎缁勪欢銆�',
+ tooltip: '閫夋嫨绫诲瀷涓恒�婇〉鐪�/椤佃剼銆嬫椂锛屾墦鍗扮殑姣忛〉閲岄兘浼氬甫鏈夎缁勪欢銆傛敞锛氶〉鐪夐〉鑴氫腑鏂囨湰鍏冪礌灏嗘浛鎹� @pageIndex@锛堥〉鐮侊級銆丂total@锛堟�绘暟锛夈�丂date@锛堝綋鍓嶆棩鏈燂級銆丂datetime@锛堝綋鍓嶆椂闂达級锛屼娇鐢ㄥ垎椤靛弬鏁版椂娉ㄦ剰鎵撳嵃妯℃澘鐨勯〉闈㈠竷灞�浣跨敤鍒嗛〉銆�',
required: false,
options: [
- {value: 'content', label: '鍐呭'},
+ {value: 'content', label: '灞炴�у崱'},
{value: 'headerOrfooter', label: '椤电湁/椤佃剼'},
],
controlFields: [
--
Gitblit v1.8.0