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/share/actioncomponent/formconfig.jsx |   80 +++++++++++++++++++++++++++++++++++----
 1 files changed, 71 insertions(+), 9 deletions(-)

diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 684488f..3b1815b 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { btnClasses } from '@/utils/option.js'
+import { btnClasses, modalClasses } from '@/utils/option.js'
 
 /**
  * @description 鑾峰彇鎸夐挳琛ㄥ崟閰嶇疆淇℃伅
@@ -187,6 +187,9 @@
     } else {
       appMenus = []
     }
+    // if (appType === 'mob') {
+    //   appMenus.push({value: 'sign', text: '绛惧悕锛堢郴缁熼〉锛�'})
+    // }
     appMenus.push({value: 'goback', text: '杩斿洖锛堜笂涓�椤碉級'})
   } else {
     menulist = sessionStorage.getItem('fstMenuList')
@@ -217,6 +220,7 @@
       { value: 'expPdf', text: '瀵煎嚭PDF' },
       { value: 'shareLink', text: '鍒嗕韩閾炬帴' },
       { value: 'openLocation', text: '鎵撳紑鍦板浘'},
+      { value: 'wxPublicAuth', text: '寰俊鍏紬鍙锋巿鏉�'},
       { value: 'logout', text: '閫�鍑�' },
       { value: 'goBack', text: '杩斿洖' },
     ]
@@ -837,6 +841,10 @@
       options: [{
         value: 'never',
         text: '涓嶅埛鏂�'
+      }, {
+        value: 'line',
+        text: '鍒锋柊琛�',
+        $disabled: !['table_normaltable', 'table_editable', 'table_basetable', 'card_datacard', 'card_dualdatacard'].includes(alltype)
       }, {
         value: 'grid',
         text: '鍒锋柊褰撳墠缁勪欢'
@@ -1464,6 +1472,15 @@
     },
     {
       type: 'text',
+      key: 'extValue',
+      label: '鎵╁睍鍊�',
+      initVal: card.extValue || '',
+      required: true,
+      readonly: false,
+      forbid: appType === 'mob'
+    },
+    {
+      type: 'text',
       key: 'extLabel',
       label: '鎵╁睍鍚嶇О',
       initVal: card.extLabel || '',
@@ -1472,12 +1489,30 @@
       forbid: appType === 'mob'
     },
     {
+      type: 'select',
+      key: 'extStyle',
+      label: '鎵╁睍鏍峰紡',
+      initVal: card.extStyle || '',
+      required: false,
+      options: modalClasses,
+      forbid: appType === 'mob'
+    },
+    {
       type: 'text',
-      key: 'extValue',
-      label: '鎵╁睍鍊�',
-      initVal: card.extValue || '',
-      required: true,
+      key: 'confLabel',
+      label: '纭畾鍚嶇О',
+      initVal: card.confLabel || '',
+      required: false,
       readonly: false,
+      forbid: appType === 'mob'
+    },
+    {
+      type: 'select',
+      key: 'confStyle',
+      label: '纭畾鏍峰紡',
+      initVal: card.confStyle || '',
+      required: false,
+      options: modalClasses,
       forbid: appType === 'mob'
     },
     {
@@ -2284,6 +2319,9 @@
         value: 'never',
         text: '涓嶅埛鏂�'
       }, {
+        value: 'line',
+        text: '鍒锋柊琛�'
+      }, {
         value: 'grid',
         text: '鍒锋柊褰撳墠缁勪欢'
       }, {
@@ -2739,6 +2777,14 @@
     },
     {
       type: 'text',
+      key: 'extValue',
+      label: '鎵╁睍鍊�',
+      initVal: card.extValue || '',
+      required: true,
+      readonly: false
+    },
+    {
+      type: 'text',
       key: 'extLabel',
       label: '鎵╁睍鍚嶇О',
       initVal: card.extLabel || '',
@@ -2746,14 +2792,30 @@
       readonly: false
     },
     {
+      type: 'select',
+      key: 'extStyle',
+      label: '鎵╁睍鏍峰紡',
+      initVal: card.extStyle || '',
+      required: false,
+      options: modalClasses
+    },
+    {
       type: 'text',
-      key: 'extValue',
-      label: '鎵╁睍鍊�',
-      initVal: card.extValue || '',
-      required: true,
+      key: 'confLabel',
+      label: '纭畾鍚嶇О',
+      initVal: card.confLabel || '',
+      required: false,
       readonly: false
     },
     {
+      type: 'select',
+      key: 'confStyle',
+      label: '纭畾鏍峰紡',
+      initVal: card.confStyle || '',
+      required: false,
+      options: modalClasses
+    },
+    {
       type: 'radio',
       key: 'execType',
       label: '璇锋眰鏂瑰紡',

--
Gitblit v1.8.0