From cad4c57867b08541bb560e871b690e4e730cc1b8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 15 四月 2023 14:29:27 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/table/edit-table/options.jsx | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/table/edit-table/options.jsx b/src/menu/components/table/edit-table/options.jsx
index 977367f..9e47b44 100644
--- a/src/menu/components/table/edit-table/options.jsx
+++ b/src/menu/components/table/edit-table/options.jsx
@@ -62,6 +62,9 @@
options: [
{value: 'true', label: '鍙紪杈�'},
{value: 'false', label: '涓嶅彲缂栬緫'},
+ ],
+ controlFields: [
+ {field: 'switchable', values: ['true']},
]
},
{
@@ -225,6 +228,19 @@
tooltip: '榛樿鍊� #e8e8e8銆�',
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: 'color',
// field: 'color',
@@ -264,7 +280,19 @@
{value: 'true', label: '鍚敤'},
{value: 'false', label: '绂佺敤'},
],
- forbid: !appType
+ 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: '绂佺敤'},
+ ]
},
{
type: 'multiselect',
--
Gitblit v1.8.0