From e5a92d6bee2b8d47d5c145ed92485fd19b663b0f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 27 十二月 2024 12:26:21 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/menu/components/card/data-card/options.jsx |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/menu/components/card/data-card/options.jsx b/src/menu/components/card/data-card/options.jsx
index 8618072..4b010f9 100644
--- a/src/menu/components/card/data-card/options.jsx
+++ b/src/menu/components/card/data-card/options.jsx
@@ -273,10 +273,10 @@
       required: false,
       linkField: 'datatype',
       options: [
-        {ParentID: '', value: 'static', label: '闈欐�佸��'},
         {ParentID: 'dynamic', value: 'dynamic', label: '鍔ㄦ�佸��'},
-        {ParentID: 'dynamic', value: 'joint', label: '鎷兼帴鍊�'},
         {ParentID: 'public', value: 'dynamic', label: '鍔ㄦ�佸��'},
+        {ParentID: '', value: 'static', label: '闈欐�佸��'},
+        {ParentID: 'dynamic', value: 'joint', label: '鎷兼帴鍊�'},
         {ParentID: 'public', value: 'joint', label: '鎷兼帴鍊�'},
       ],
       forbid: subtype !== 'propcard'
@@ -314,7 +314,7 @@
       type: 'select',
       field: 'selStyle',
       label: '閫変腑椋庢牸',
-      initval: wrap.selStyle || 'active',
+      initval: wrap.selStyle || 'none',
       tooltip: '瀛樺湪杈规鏃讹紝杈规浼氫娇鐢ㄧ郴缁熻壊銆�',
       required: false,
       options: [

--
Gitblit v1.8.0