From 35f51aad9824b55bbe67c0fb21bd3d3d24381c2f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 16 七月 2023 21:42:33 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/table/normal-table/options.jsx | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/table/normal-table/options.jsx b/src/menu/components/table/normal-table/options.jsx
index 8cf29d7..688c674 100644
--- a/src/menu/components/table/normal-table/options.jsx
+++ b/src/menu/components/table/normal-table/options.jsx
@@ -47,7 +47,7 @@
field: 'height',
label: '楂樺害',
initval: wrap.height || '',
- tooltip: '琛ㄦ牸楂樺害锛岀┖鍊兼椂楂樺害鑷�傚簲銆�',
+ tooltip: '琛ㄦ牸楂樺害锛岀┖鍊兼椂楂樺害鑷�傚簲銆傛敞锛氬皬浜庣瓑浜�100鏃朵负楂樺害鐨勭櫨鍒嗘瘮銆�',
min: 10,
max: 3000,
precision: 0,
@@ -212,6 +212,16 @@
},
{
type: 'select',
+ field: 'tipField',
+ label: '淇℃伅鎻愮ず',
+ initval: wrap.tipField || '',
+ tooltip: '榧犳爣鎮诞浜庤涓婃柟鏃剁殑鎻愮ず淇℃伅銆�',
+ required: false,
+ allowClear: true,
+ options: columns
+ },
+ {
+ type: 'select',
field: 'controlField',
label: '绂佺敤瀛楁',
initval: wrap.controlField || '',
@@ -259,13 +269,13 @@
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'
+ forbid: sessionStorage.getItem('editMenuType') === 'popview'
},
{
type: 'multiselect',
--
Gitblit v1.8.0