From 628568ec9eeacfeead025612d7fd666fec756282 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 四月 2023 17:48:39 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/menu/components/table/base-table/options.jsx |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/menu/components/table/base-table/options.jsx b/src/menu/components/table/base-table/options.jsx
index 22efc6a..b8ae7e5 100644
--- a/src/menu/components/table/base-table/options.jsx
+++ b/src/menu/components/table/base-table/options.jsx
@@ -32,8 +32,8 @@
     {
       type: 'radio',
       field: 'actionfixed',
-      label: '鎸夐挳鍥哄畾',
-      initval: wrap.actionfixed || 'false',
+      label: '鍥哄畾鎸夐挳',
+      initval: wrap.actionfixed !== 'true' ? 'false' : 'true',
       required: false,
       options: [
         {value: 'true', label: '鏄�'},
@@ -41,6 +41,17 @@
       ]
     },
     {
+      type: 'checkbox',
+      field: 'colfixed',
+      label: '鍥哄畾鍒�',
+      initval: wrap.colfixed || [],
+      required: false,
+      options: [
+        {value: 'first', label: '棣栧垪'},
+        {value: 'last', label: '灏惧垪'},
+      ]
+    },
+    {
       type: 'radio',
       field: 'size',
       label: '琛ㄦ牸澶у皬',

--
Gitblit v1.8.0