From 88f178df654b08411470a7eab75b3d5fed8817c0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 03 十一月 2023 01:37:45 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/table/edit-table/options.jsx | 134 +++++---------------------------------------
1 files changed, 16 insertions(+), 118 deletions(-)
diff --git a/src/menu/components/table/edit-table/options.jsx b/src/menu/components/table/edit-table/options.jsx
index e3c2fb5..33616a8 100644
--- a/src/menu/components/table/edit-table/options.jsx
+++ b/src/menu/components/table/edit-table/options.jsx
@@ -1,7 +1,7 @@
/**
* @description Wrap琛ㄥ崟閰嶇疆淇℃伅
*/
-export default function (wrap, action = []) {
+export default function (wrap, columns = []) {
let roleList = sessionStorage.getItem('sysRoles')
let appType = sessionStorage.getItem('appType')
@@ -47,7 +47,7 @@
field: 'height',
label: '楂樺害',
initval: wrap.height || '',
- tooltip: '琛ㄦ牸楂樺害锛岀┖鍊兼椂楂樺害鑷�傚簲銆�',
+ tooltip: '琛ㄦ牸楂樺害锛岀┖鍊兼椂楂樺害鑷�傚簲銆傛敞锛氬皬浜庣瓑浜�100鏃朵负楂樺害鐨勭櫨鍒嗘瘮銆�',
min: 10,
max: 3000,
precision: 0,
@@ -55,74 +55,15 @@
},
{
type: 'radio',
- field: 'editable',
- label: '鍒濆鍖�',
- initval: wrap.editable || 'false',
- required: false,
- options: [
- {value: 'true', label: '鍙紪杈�'},
- {value: 'false', label: '涓嶅彲缂栬緫'},
- ],
- controlFields: [
- {field: 'switchable', values: ['true']},
- ]
- },
- {
- type: 'radio',
- field: 'submittal',
- label: '鎻愪氦鍚�',
- initval: wrap.submittal || 'false',
- required: false,
- options: [
- {value: 'true', label: '鍙紪杈�'},
- {value: 'false', label: '涓嶅彲缂栬緫'},
- ]
- },
- {
- type: 'radio',
- field: 'addable',
- label: '鍙柊澧�',
- initval: wrap.addable || 'false',
- required: false,
- options: [
- {value: 'true', label: '鏄�'},
- {value: 'false', label: '鍚�'},
- ]
- },
- {
- type: 'radio',
- field: 'delable',
- label: '鍙垹闄�',
- initval: wrap.delable || 'true',
- required: false,
- options: [
- {value: 'true', label: '鏄�'},
- {value: 'false', label: '鍚�'},
- ]
- },
- {
- type: 'radio',
field: 'commit',
label: '鏁版嵁鎻愪氦',
initval: wrap.commit || 'all',
- tooltip: '鍗曢」鎻愪氦鎸囧湪琛ㄥ崟涓洖杞︽垨鍒犻櫎琛屾椂锛岃缃负鍗曢」鏃跺鐐瑰嚮鎻愪氦鎸夐挳锛屼細鎻愪氦淇敼椤广��',
+ tooltip: '璁剧疆涓轰慨鏀归」鏃讹紝鍦ㄥけ鍘荤劍鐐逛笖涓嶅瓨鍦ㄥ繀濉」涓虹┖鏃惰Е鍙戞彁浜ゃ�傝缃负淇敼椤癸紙鍏級鏃讹紝鍦ㄧ偣鍑绘彁浜ゆ寜閽椂瑙﹀彂鎻愪氦銆�',
required: false,
options: [
{value: 'all', label: '鍏ㄩ儴'},
{value: 'change', label: '淇敼椤�'},
- {value: 'simple', label: '鍗曢」'},
- ]
- },
- {
- type: 'radio',
- field: 'operType',
- label: '缂栬緫鎸夐挳',
- initval: wrap.operType || 'btnMode',
- tooltip: '缂栬緫鏃剁殑娣诲姞銆佸垹闄ゆ寜閽樉绀轰綅缃紝娉細浣跨敤娴爣鏃惰〃鏍兼í鍚戞粴鍔ㄥけ鏁堬紝琛ㄦ牸璁剧疆楂樺害鏃舵诞鏍囨棤鏁堛��',
- required: false,
- options: [
- {value: 'btnMode', label: '鎸夐挳寮�'},
- {value: 'buoyMode', label: '娴爣寮�'},
+ {value: 'amend', label: '淇敼椤癸紙鍏級'},
]
},
{
@@ -208,18 +149,6 @@
{value: 'ghost', label: '閫忔槑'},
]
},
- // {
- // type: 'radio',
- // field: 'show',
- // label: '鎼滅储鎸夐挳',
- // initval: wrap.show || 'true',
- // tooltip: '鎼滅储鏉′欢瀛樺湪鏃讹紝鍙�夋嫨鏄惁鏄剧ず鎼滅储鎸夐挳銆�',
- // required: false,
- // options: [
- // {value: 'true', label: '鏄剧ず'},
- // {value: 'false', label: '闅愯棌'},
- // ]
- // },
{
type: 'color',
field: 'borderColor',
@@ -241,58 +170,17 @@
{value: 'bottom', label: '鍚戜笅'},
]
},
- // {
- // type: 'color',
- // field: 'color',
- // label: '瀛椾綋棰滆壊',
- // initval: wrap.color || 'rgba(0, 0, 0, 0.65)',
- // tooltip: '榛樿鍊� rgba(0, 0, 0, 0.65)銆�',
- // required: false
- // },
- // {
- // type: 'number',
- // field: 'fontSize',
- // label: '瀛椾綋澶у皬',
- // initval: wrap.fontSize || 14,
- // min: 12,
- // max: 30,
- // precision: 0,
- // required: false
- // },
- // {
- // type: 'number',
- // field: 'advanceWidth',
- // label: '楂樼骇鎼滅储',
- // initval: wrap.advanceWidth || 1000,
- // tooltip: '楂樼骇鎼滅储寮圭獥鐨勫搴︼紝娉細褰撳搴﹀�煎皬浜�100鏃惰〃绀哄崰绐楀彛鐨勭櫨鍒嗘瘮锛屽ぇ浜�100鏃惰〃绀哄搴︾殑缁濆鍊笺��',
- // min: 10,
- // max: 3000,
- // precision: 0,
- // required: false
- // },
{
type: 'radio',
field: 'permission',
label: '鏉冮檺楠岃瘉',
- initval: wrap.permission || 'false',
+ initval: wrap.permission || (!appType ? 'true' : 'false'),
required: false,
options: [
{value: 'true', label: '鍚敤'},
{value: 'false', label: '绂佺敤'},
],
- forbid: !appType || sessionStorage.getItem('editMenuType') === 'popview'
- },
- {
- type: 'radio',
- field: 'switchable',
- label: '鐘舵�佸垏鎹�',
- initval: wrap.switchable || 'true',
- tooltip: '鏄惁鍙互鍦ㄧ紪杈戝拰榛樿table鐘舵�侀棿鍒囨崲銆�',
- required: false,
- options: [
- {value: 'true', label: '鍚敤'},
- {value: 'false', label: '绂佺敤'},
- ]
+ forbid: sessionStorage.getItem('editMenuType') === 'popview'
},
{
type: 'radio',
@@ -307,6 +195,16 @@
],
},
{
+ type: 'select',
+ field: 'tipField',
+ label: '淇℃伅鎻愮ず',
+ initval: wrap.tipField || '',
+ tooltip: '榧犳爣鎮诞浜庤涓婃柟鏃剁殑鎻愮ず淇℃伅銆�',
+ required: false,
+ allowClear: true,
+ options: columns
+ },
+ {
type: 'multiselect',
field: 'blacklist',
label: '榛戝悕鍗�',
--
Gitblit v1.8.0