From b6c698c8833836971184a0a9c2645a15f8174d37 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 08 五月 2025 16:31:18 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/table/edit-table/options.jsx | 264 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 168 insertions(+), 96 deletions(-)
diff --git a/src/menu/components/table/edit-table/options.jsx b/src/menu/components/table/edit-table/options.jsx
index 307b6ca..a239a89 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')
@@ -45,13 +45,111 @@
{
type: 'number',
field: 'height',
- label: '楂樺害',
+ label: '鏈�澶ч珮搴�',
initval: wrap.height || '',
- tooltip: '琛ㄦ牸楂樺害锛岀┖鍊兼椂楂樺害鑷�傚簲銆�',
- min: 10,
+ tooltip: '琛ㄦ牸鍐呭鍖虹殑鏈�澶ч珮搴︼紙涓嶅寘鍚〃澶达級锛岀┖鍊兼椂楂樺害鑷�傚簲銆傛敞锛氬皬浜庣瓑浜�100澶т簬0鏃朵负楂樺害鐨勭櫨鍒嗘瘮锛屽皬浜�0鏃朵负绐楀彛楂樺害鍑忓幓姝ゅ�笺��',
+ min: -1000,
max: 3000,
precision: 0,
required: false
+ },
+ {
+ type: 'select',
+ field: 'commit',
+ label: '鏁版嵁鎻愪氦',
+ initval: wrap.commit || 'all',
+ tooltip: '璁剧疆涓轰慨鏀归」鏃讹紝鍦ㄥけ鍘荤劍鐐逛笖涓嶅瓨鍦ㄥ繀濉」涓虹┖鏃惰Е鍙戞彁浜ゃ�傝缃负淇敼椤癸紙鍏級鏃讹紝鍦ㄧ偣鍑绘彁浜ゆ寜閽椂瑙﹀彂鎻愪氦銆傝缃负鍕鹃�夐」鏃讹紝鍙彁浜ら�変腑鐨勬暟鎹紝鏈�変腑鏁版嵁鏃朵笉鍙彁浜ゃ��',
+ required: false,
+ options: [
+ {value: 'all', label: '鍏ㄩ儴'},
+ {value: 'change', label: '淇敼椤�'},
+ {value: 'amend', label: '淇敼椤癸紙鍏級'},
+ {value: 'check', label: '鍕鹃�夐」'},
+ ],
+ reset_source: true,
+ callback: (record) => {
+ return {
+ tableType: [
+ {value: '', label: '涓嶅彲閫�', disabled: record.commit === 'check'},
+ {value: 'radio', label: '鍗曢��'},
+ {value: 'checkbox', label: '澶氶��'},
+ ]
+ }
+ }
+ },
+ {
+ type: 'radio',
+ field: 'editType',
+ label: '缂栬緫妯″紡',
+ initval: wrap.editType || 'simple',
+ tooltip: '鍙紪杈戣〃鍗曟槸鍚﹀叏閮ㄦ斁寮�銆�',
+ required: false,
+ options: [
+ {value: 'simple', label: '鍗曢」'},
+ {value: 'multi', label: '鏁翠綋'},
+ ]
+ },
+ // {
+ // type: 'radio',
+ // field: 'cache',
+ // label: '缂撳瓨',
+ // initval: wrap.cache || 'true',
+ // tooltip: '瀵逛簬浣跨敤鏁版嵁婧愮殑涓嬫媺鑿滃崟锛屼笅鎷夐�夐」鏄惁缂撳瓨鍒版湰鍦般��',
+ // required: false,
+ // options: [
+ // {value: 'true', label: '浣跨敤'},
+ // {value: 'false', label: '涓嶄娇鐢�'},
+ // ]
+ // },
+ {
+ type: 'radio',
+ field: 'tableType',
+ label: '琛ㄦ牸灞炴��',
+ initval: wrap.tableType || '',
+ required: false,
+ timestamp: new Date().getTime(),
+ options: [
+ {value: '', label: '涓嶅彲閫�', disabled: wrap.commit === 'check'},
+ {value: 'radio', label: '鍗曢��'},
+ {value: 'checkbox', label: '澶氶��'},
+ ]
+ },
+ {
+ type: 'radio',
+ field: 'size',
+ label: '琛ㄦ牸澶у皬',
+ initval: wrap.size || 'middle',
+ tooltip: '琛ㄦ牸鐨勫唴杈硅窛锛屼粠澶у埌灏忎緷娆￠�掑噺銆�',
+ required: false,
+ options: [
+ {value: 'default', label: '澶�'},
+ {value: 'middle', label: '涓�'},
+ {value: 'small', label: '灏�'},
+ // {value: 'mini', label: '杩蜂綘'},
+ ]
+ },
+ {
+ type: 'radio',
+ field: 'searchSize',
+ label: '鎼滅储鏍峰紡',
+ initval: wrap.searchSize === 'middle' ? '' : wrap.searchSize || '',
+ required: false,
+ options: [
+ {value: '', label: '榛樿'},
+ {value: 'small', label: '灏忛棿璺�'},
+ {value: 'updown', label: '涓婁笅鎺掑垪'},
+ ],
+ },
+ {
+ type: 'radio',
+ field: 'parity',
+ label: '濂囧伓寮傝壊',
+ initval: wrap.parity || 'false',
+ required: false,
+ options: [
+ {value: 'true', label: '鍚敤'},
+ {value: 'false', label: '绂佺敤'},
+ ]
},
{
type: 'radio',
@@ -77,20 +175,6 @@
},
{
type: 'radio',
- field: 'size',
- label: '琛ㄦ牸澶у皬',
- initval: wrap.size || 'middle',
- tooltip: '琛ㄦ牸鐨勫唴杈硅窛锛屼粠澶у埌灏忎緷娆￠�掑噺銆�',
- required: false,
- options: [
- {value: 'default', label: '澶�'},
- {value: 'middle', label: '涓�'},
- {value: 'small', label: '灏�'},
- // {value: 'mini', label: '寰�'},
- ]
- },
- {
- type: 'radio',
field: 'mode',
label: '妯″紡',
initval: wrap.mode || 'default',
@@ -98,63 +182,6 @@
options: [
{value: 'default', label: '甯歌'},
{value: 'ghost', label: '閫忔槑'},
- ]
- },
- {
- type: 'radio',
- field: 'show',
- label: '鎼滅储鎸夐挳',
- initval: wrap.show || 'true',
- tooltip: '鎼滅储鏉′欢瀛樺湪鏃讹紝鍙�夋嫨鏄惁鏄剧ず鎼滅储鎸夐挳銆�',
- 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: 'editable',
- label: '鍒濆鍖�',
- initval: wrap.editable || 'false',
- required: false,
- options: [
- {value: 'true', label: '鍙紪杈�'},
- {value: 'false', label: '涓嶅彲缂栬緫'},
- ]
- },
- {
- type: 'radio',
- field: 'cache',
- label: '缂撳瓨',
- initval: wrap.cache || 'true',
- tooltip: '瀵逛簬浣跨敤鏁版嵁婧愮殑涓嬫媺鑿滃崟锛屼笅鎷夐�夐」鏄惁缂撳瓨鍒版湰鍦般��',
- required: false,
- options: [
- {value: 'true', label: '浣跨敤'},
- {value: 'false', label: '涓嶄娇鐢�'},
]
},
{
@@ -166,31 +193,76 @@
required: false
},
{
- type: 'color',
- field: 'color',
- label: '瀛椾綋棰滆壊',
- initval: wrap.color || 'rgba(0, 0, 0, 0.65)',
- tooltip: '榛樿鍊� rgba(0, 0, 0, 0.65)銆�',
- required: false
+ type: 'radio',
+ field: 'vertical',
+ label: '鍨傜洿瀵归綈',
+ initval: wrap.vertical || 'middle',
+ tooltip: '鍗曞厓鏍肩殑鍨傜洿瀵归綈鏂瑰紡銆�',
+ required: false,
+ options: [
+ {value: 'top', label: '鍚戜笂'},
+ {value: 'middle', label: '灞呬腑'},
+ {value: 'bottom', label: '鍚戜笅'},
+ ]
+ },
+ {
+ type: 'radio',
+ field: 'permission',
+ label: '鏉冮檺楠岃瘉',
+ initval: wrap.permission || (!appType ? 'true' : 'false'),
+ required: false,
+ options: [
+ {value: 'true', label: !appType ? '缁ф壙鑿滃崟' : '鍚敤'},
+ {value: 'false', label: '绂佺敤'},
+ ],
+ forbid: sessionStorage.getItem('editMenuType') === 'popview'
+ },
+ {
+ type: 'radio',
+ field: 'empty',
+ label: '绌哄�奸殣钘�',
+ initval: wrap.empty || 'show',
+ tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛岄殣钘忚缁勪欢銆�',
+ required: false,
+ options: [
+ {value: 'show', label: '鍚�'},
+ {value: 'hidden', label: '鏄�'},
+ ],
+ controlFields: [
+ {field: 'empSign', values: ['show']},
+ ]
+ },
+ {
+ type: 'radio',
+ field: 'empSign',
+ label: '绌哄�煎浘鏍�',
+ initval: wrap.empSign || 'show',
+ tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛屾槸鍚︽樉绀虹┖鍊兼彁绀哄浘鏍囥��',
+ required: false,
+ options: [
+ {value: 'show', label: '鏄剧ず'},
+ {value: 'hidden', label: '闅愯棌'},
+ ],
+ },
+ {
+ type: 'select',
+ field: 'tipField',
+ label: '淇℃伅鎻愮ず',
+ initval: wrap.tipField || '',
+ tooltip: '榧犳爣鎮诞浜庤涓婃柟鏃剁殑鎻愮ず淇℃伅銆�',
+ required: false,
+ allowClear: true,
+ joint: true,
+ options: columns
},
{
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鏃惰〃绀哄搴︾殑缁濆鍊笺��',
+ field: 'maxPageSize',
+ label: '姣忛〉鏈�澶ф暟',
+ initval: wrap.maxPageSize || '',
+ tooltip: '鍒嗛〉鏃舵瘡椤靛彲鏄剧ず鐨勬渶澶ф暟閲忋��',
min: 10,
- max: 3000,
+ max: 500,
precision: 0,
required: false
},
--
Gitblit v1.8.0