From 400fee62fb40006a9839f1c3a8244b82566b5057 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 08 五月 2025 16:30:39 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/table/base-table/options.jsx | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/menu/components/table/base-table/options.jsx b/src/menu/components/table/base-table/options.jsx
index 8c3f5fa..f88acc1 100644
--- a/src/menu/components/table/base-table/options.jsx
+++ b/src/menu/components/table/base-table/options.jsx
@@ -79,13 +79,13 @@
{
type: 'radio',
field: 'searchSize',
- label: '鎼滅储闂磋窛',
- initval: wrap.searchSize || 'middle',
- tooltip: '鎼滅储鏉′欢鐨勪笂涓嬮棿璺濄��',
+ label: '鎼滅储鏍峰紡',
+ initval: wrap.searchSize === 'middle' ? '' : wrap.searchSize || '',
required: false,
options: [
- {value: 'middle', label: '榛樿'},
- {value: 'small', label: '灏�'},
+ {value: '', label: '榛樿'},
+ {value: 'small', label: '灏忛棿璺�'},
+ {value: 'updown', label: '涓婁笅鎺掑垪'},
],
},
{
@@ -138,13 +138,14 @@
field: 'selected',
label: '鏁版嵁閫変腑',
initval: wrap.selected || 'false',
- tooltip: '鍒濆鍖栵細鏁版嵁鍔犺浇鏃堕�変腑棣栬鏁版嵁锛屼粎鎵ц涓�娆°�傛暟鎹姞杞斤細姣忔鏁版嵁鍔犺浇鏃跺潎閫変腑棣栬锛堝綋鎸夐挳鎵ц瀹屾垚骞惰繑鍥炰富閿�兼椂锛岄粯璁ら�変腑涓婚敭鍊煎搴旇锛夈�傞�変腑鏍囪锛氳繑鍥炴暟鎹腑瀛樺湪 selected 瀛楁锛屼笖鍊间负 true 鐨勬暟鎹閫変腑銆傛敞锛氬惎鐢ㄦ棤浜哄�煎畧鏃舵棤鏁堛��',
+ tooltip: '鍒濆鍖栵細鏁版嵁鍔犺浇鏃堕�変腑棣栬鏁版嵁锛屼粎鎵ц涓�娆°�傛暟鎹姞杞斤細姣忔鏁版嵁鍔犺浇鏃跺潎閫変腑棣栬锛堝綋鎸夐挳鎵ц瀹屾垚骞惰繑鍥炰富閿�兼椂锛岄粯璁ら�変腑涓婚敭鍊煎搴旇锛夈�傞�変腑鏍囪锛氳繑鍥炴暟鎹腑瀛樺湪 selected 瀛楁锛屼笖鍊间负 true 鐨勬暟鎹閫変腑銆傛湰鍦拌褰曪細鏁版嵁鍒锋柊鏃朵笂娆¤閫変腑鐨勮灏嗚嚜鍔ㄩ�変腑銆傛敞锛氬惎鐢ㄦ棤浜哄�煎畧鏃舵棤鏁堛��',
required: false,
options: [
{value: 'false', label: '鏃�'},
{value: 'init', label: '鍒濆鍖�'},
{value: 'always', label: '鏁版嵁鍔犺浇'},
- {value: 'sign', label: '閫変腑鏍囪'}
+ {value: 'sign', label: '閫変腑鏍囪'},
+ {value: 'local', label: '鏈湴璁板綍'},
],
},
{
--
Gitblit v1.8.0