From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/menu/components/timeline/normal-timeline/options.jsx |  120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 114 insertions(+), 6 deletions(-)

diff --git a/src/menu/components/timeline/normal-timeline/options.jsx b/src/menu/components/timeline/normal-timeline/options.jsx
index b1f0327..ae0be4d 100644
--- a/src/menu/components/timeline/normal-timeline/options.jsx
+++ b/src/menu/components/timeline/normal-timeline/options.jsx
@@ -4,6 +4,7 @@
 export default function (wrap, columns) {
   let roleList = sessionStorage.getItem('sysRoles')
   let appType = sessionStorage.getItem('appType')
+  let ispop = sessionStorage.getItem('editMenuType') === 'popview'
 
   if (roleList) {
     try {
@@ -44,9 +45,27 @@
     },
     {
       type: 'radio',
+      field: 'direction',
+      label: '杞寸嚎鏂瑰悜',
+      initval: wrap.direction || 'vertical',
+      required: false,
+      options: [
+        {value: 'vertical', label: '绾靛悜'},
+        {value: 'horizontal', label: '妯悜'},
+      ],
+      controlFields: [
+        {field: 'mode', values: ['vertical']},
+        {field: 'hmode', values: ['horizontal']},
+        {field: 'label', values: ['vertical']},
+        {field: 'iconSize', values: ['horizontal']},
+        {field: 'dotSign', values: ['horizontal']},
+      ]
+    },
+    {
+      type: 'radio',
       field: 'mode',
       label: '杞寸嚎浣嶇疆',
-      initval: wrap.mode || 'left',
+      initval: ['left', 'alternate', 'right'].includes(wrap.mode) ? wrap.mode : 'left',
       required: false,
       options: [
         {value: 'left', label: '宸︿晶'},
@@ -56,15 +75,26 @@
     },
     {
       type: 'radio',
-      field: 'reverse',
-      label: '鎺掑簭',
-      initval: wrap.reverse || 'false',
+      field: 'hmode',
+      label: '杞寸嚎浣嶇疆',
+      initval: ['up', 'down'].includes(wrap.mode) ? wrap.mode : 'up',
       required: false,
       options: [
-        {value: 'false', label: '姝ｅ簭'},
-        {value: 'true', label: '鍊掑簭'},
+        {value: 'up', label: '涓婁晶'},
+        {value: 'down', label: '涓嬩晶'}
       ]
     },
+    // {
+    //   type: 'radio',
+    //   field: 'reverse',
+    //   label: '鎺掑簭',
+    //   initval: wrap.reverse || 'false',
+    //   required: false,
+    //   options: [
+    //     {value: 'false', label: '姝ｅ簭'},
+    //     {value: 'true', label: '鍊掑簭'},
+    //   ]
+    // },
     {
       type: 'color',
       field: 'color',
@@ -85,6 +115,35 @@
       ]
     },
     {
+      type: 'radio',
+      field: 'dotSign',
+      label: '鑺傜偣娓叉煋',
+      initval: wrap.dotSign || 'background',
+      tooltip: '鑺傜偣鐨勬覆鏌撴柟寮忥紝鍦ㄨ妭鐐圭粍涓缃殑棰滆壊娓叉煋鍥炬爣杩樻槸娓叉煋鑳屾櫙鑹层��',
+      required: false,
+      options: [
+        {value: 'background', label: '鑳屾櫙鑹�'},
+        {value: 'icon', label: '鍥炬爣'},
+      ]
+    },
+    {
+      type: 'select',
+      field: 'iconSize',
+      label: '鍥炬爣澶у皬',
+      initval: wrap.iconSize || '',
+      tooltip: '鍥炬爣鍙湪鑺傜偣缁勪腑娣诲姞銆�',
+      required: false,
+      options: [
+        {value: '', label: '榛樿(14px)'},
+        {value: 'size16', label: '16px'},
+        {value: 'size18', label: '18px'},
+        {value: 'size20', label: '20px'},
+        {value: 'size22', label: '22px'},
+        {value: 'size24', label: '24px'},
+        {value: 'adaptive', label: '鑷�傚簲'},
+      ]
+    },
+    {
       type: 'select',
       field: 'label',
       label: '鏍囩',
@@ -104,6 +163,55 @@
       options: columns
     },
     {
+      type: 'radio',
+      field: 'btnControl',
+      label: '鎸夐挳鎺у埗',
+      initval: wrap.btnControl || 'show',
+      tooltip: '鍙缃寜閽樉绀鸿鍒欙紝濮嬬粓鏄剧ず鎴栭紶鏍囨偓娴椂鏄剧ず銆�',
+      required: false,
+      options: [
+        {value: 'show', label: '姝ｅ父鏄剧ず'},
+        {value: 'hover', label: '鎮诞鏄剧ず'},
+      ],
+      forbid: appType === 'mob'
+    },
+    {
+      type: 'radio',
+      field: 'permission',
+      label: '鏉冮檺楠岃瘉',
+      initval: wrap.permission || (!appType ? 'true' : 'false'),
+      required: false,
+      options: [
+        {value: 'true', label: !appType ? '缁ф壙鑿滃崟' : '鍚敤'},
+        {value: 'false', label: '绂佺敤'},
+      ],
+      forbid: ispop
+    },
+    {
+      type: 'radio',
+      field: 'cacheLocal',
+      label: '鏈湴缂撳瓨',
+      initval: wrap.cacheLocal || 'true',
+      required: false,
+      options: [
+        {value: 'true', label: '缁ф壙鑿滃崟'},
+        {value: 'false', label: '绂佺敤'},
+      ],
+      forbid: ispop
+    },
+    {
+      type: 'radio',
+      field: 'empty',
+      label: '绌哄�奸殣钘�',
+      initval: wrap.empty || 'show',
+      tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛岄殣钘忚缁勪欢銆�',
+      required: false,
+      options: [
+        {value: 'show', label: '鍚�'},
+        {value: 'hidden', label: '鏄�'},
+      ],
+    },
+    {
       type: 'multiselect',
       field: 'blacklist',
       label: '榛戝悕鍗�',

--
Gitblit v1.8.0