From d4d2b680baff18f950da5e77463c1f0e26dbd567 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 03 四月 2025 10:10:25 +0800
Subject: [PATCH] 2025-04-03

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

diff --git a/src/menu/components/card/data-card/options.jsx b/src/menu/components/card/data-card/options.jsx
index 4ea2fb5..9b0aeec 100644
--- a/src/menu/components/card/data-card/options.jsx
+++ b/src/menu/components/card/data-card/options.jsx
@@ -1,4 +1,4 @@
-import MenuUtils from '@/utils/utils-custom.js'
+import MenuUtils, { getInterfaces } from '@/utils/utils-custom.js'
 
 /**
  * @description Wrap琛ㄥ崟閰嶇疆淇℃伅
@@ -9,16 +9,10 @@
   let ispop = sessionStorage.getItem('editMenuType') === 'popview'
   let menu = window.GLOB.customMenu
   let laypage = setting && setting.laypage !== 'false'
+
   let interfaces = []
-  if (subtype === 'propcard' && menu.interfaces) {
-    menu.interfaces.forEach(item => {
-      if (item.status === 'true') {
-        interfaces.push({
-          value: item.uuid,
-          label: item.name
-        })
-      }
-    })
+  if (subtype === 'propcard') {
+    interfaces = getInterfaces()
   }
   let modules = []
   if (subtype === 'propcard' || subtype === 'datacard') {
@@ -159,7 +153,7 @@
       field: 'datatype',
       label: '鏁版嵁鏉ユ簮',
       initval: wrap.datatype || 'dynamic',
-      tooltip: '閫夋嫨闈欐�佸�硷紝鏃犻渶閰嶇疆鏁版嵁婧愩��',
+      tooltip: '閫夋嫨闈欐�佹椂锛屾棤闇�閰嶇疆鏁版嵁婧愶紝鍙睍绀轰笂绾х粍浠舵垨url鍙傛暟瀛楁銆�',
       required: false,
       options: [
         {value: 'dynamic', label: '鍔ㄦ��', priKeyType: 'static'},
@@ -167,7 +161,7 @@
         {value: 'public', label: '鍏叡鏁版嵁婧�', priKeyType: 'static'},
       ],
       linkFields: ['priKeyType'],
-      controlFields: [
+      controlFields: subtype === 'propcard' ? [
         {field: 'goback', values: ['dynamic', 'public']},
         {field: 'empty', values: ['dynamic', 'public']},
         {field: 'jump', values: ['dynamic', 'public']},
@@ -175,7 +169,7 @@
         {field: 'supModule', values: ['static']},
         {field: 'publicId', values: ['public']},
         {field: 'emptyExec', values: ['dynamic', 'public']},
-      ],
+      ] : null,
       forbid: subtype !== 'propcard'
     },
     {
@@ -187,38 +181,17 @@
       options: interfaces,
       reset_source: true,
       forbid: subtype !== 'propcard',
-      callback: (map, record) => {
+      callback: (record) => {
         if (!record.publicId) return
         
-        let interfaces = window.GLOB.customMenu.interfaces || []
-        
-        let d = interfaces.filter(m => m.uuid === record.publicId && m.status === 'true')[0]
+        let d = interfaces.filter(m => m.value === record.publicId)[0]
         
         if (!d || !d.columns) return
-        let columns = JSON.parse(JSON.stringify(d.columns))
 
-        let _broadcast = map.get('broadcast')
-
-        if (_broadcast && !_broadcast.forbid) {
-          _broadcast.options = columns
-          _broadcast.oriOptions = columns
-          map.set('broadcast', _broadcast)
-        }
-        
-        let _jumpField = map.get('jumpField')
-
-        if (_jumpField && !_jumpField.forbid) {
-          _jumpField.options = columns
-          _jumpField.oriOptions = columns
-          map.set('jumpField', _jumpField)
-        }
-
-        let _link = map.get('link')
-
-        if (_link && !_link.forbid) {
-          _link.options = columns
-          _link.oriOptions = columns
-          map.set('link', _link)
+        return {
+          broadcast: d.columns,
+          jumpField: d.columns,
+          link: d.columns
         }
       }
     },
@@ -236,8 +209,21 @@
       controlFields: subtype !== 'propcard' ? [
         {field: 'printHeight', values: ['flex']},
         {field: 'cardFloat', values: ['grid']},
+        {field: 'zHeight', values: ['grid']},
       ] : [{field: 'cardFloat', values: ['grid']}],
       forbid: subtype === 'tablecard'
+    },
+    {
+      type: 'number',
+      field: 'zHeight',
+      label: '鏈�澶ч珮搴�',
+      initval: wrap.zHeight || '',
+      tooltip: '鍗$墖鍐呭鍖虹殑鏈�澶ч珮搴︼紙涓嶅寘鍚爣棰樸�佺炕椤电瓑鍏冪礌锛夛紝娣诲姞楂樺害鍚庣粍浠朵腑绗竴涓睘鎬у崱灏嗗浐瀹氫簬澶撮儴銆傛敞锛氬皬浜庣瓑浜�100澶т簬0鏃朵负楂樺害鐨勭櫨鍒嗘瘮锛屽皬浜�0鏃朵负绐楀彛楂樺害鍑忓幓姝ゅ�笺��',
+      min: -1000,
+      max: 3000,
+      precision: 0,
+      required: false,
+      forbid: subtype !== 'datacard' || appType === 'mob'
     },
     {
       type: 'radio',
@@ -287,12 +273,10 @@
       required: false,
       linkField: 'datatype',
       options: [
-        {ParentID: 'static', value: 'static', label: '闈欐�佸��'},
-        {ParentID: 'dynamic', value: 'static', label: '闈欐�佸��'},
         {ParentID: 'dynamic', value: 'dynamic', label: '鍔ㄦ�佸��'},
-        {ParentID: 'dynamic', value: 'joint', label: '鎷兼帴鍊�'},
-        {ParentID: 'public', value: 'static', label: '闈欐�佸��'},
         {ParentID: 'public', value: 'dynamic', label: '鍔ㄦ�佸��'},
+        {ParentID: '', value: 'static', label: '闈欐�佸��'},
+        {ParentID: 'dynamic', value: 'joint', label: '鎷兼帴鍊�'},
         {ParentID: 'public', value: 'joint', label: '鎷兼帴鍊�'},
       ],
       forbid: subtype !== 'propcard'
@@ -330,7 +314,7 @@
       type: 'select',
       field: 'selStyle',
       label: '閫変腑椋庢牸',
-      initval: wrap.selStyle || 'active',
+      initval: wrap.selStyle || 'none',
       tooltip: '瀛樺湪杈规鏃讹紝杈规浼氫娇鐢ㄧ郴缁熻壊銆�',
       required: false,
       options: [
@@ -427,6 +411,7 @@
       label: '璇煶鎾姤',
       initval: wrap.broadcast || '',
       tooltip: '璇煶鎾姤鍦ㄧЩ鍔ㄧ鏈夋晥銆傛敞锛氬湪H5涓浣跨敤闊抽閾炬帴锛屾坊鍔犲畾鏃跺櫒鏃讹紝鍙惊鐜挱鎶�',
+      timestamp: new Date().getTime(),
       required: false,
       options: columns,
       forbid: !columns || appType !== 'mob' || subtype !== 'propcard'
@@ -455,9 +440,9 @@
         {value: 'normal', label: '姝e父鏄剧ず'},
         {value: 'hidden', label: '涓嶅彲瑙�'},
       ],
-      controlFields: [
+      controlFields: subtype === 'propcard' ? [
         {field: 'empty', values: ['normal']},
-      ],
+      ] : null,
       forbid: subtype !== 'propcard'
     },
     {
@@ -467,11 +452,26 @@
       initval: wrap.empty || 'show',
       tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛岄殣钘忚缁勪欢銆�',
       required: false,
-      skip: true,
       options: [
         {value: 'show', label: '鍚�'},
         {value: 'hidden', label: '鏄�'},
       ],
+      controlFields: [
+        {field: 'empSign', values: ['show']},
+      ]
+    },
+    {
+      type: 'radio',
+      field: 'empSign',
+      label: '绌哄�煎浘鏍�',
+      initval: wrap.empSign || 'show',
+      tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛屾槸鍚︽樉绀虹┖鍊兼彁绀哄浘鏍囥��',
+      required: false,
+      options: [
+        {value: 'show', label: '鏄剧ず'},
+        {value: 'hidden', label: '闅愯棌'},
+      ],
+      forbid: subtype === 'propcard'
     },
     {
       type: 'select',
@@ -484,7 +484,17 @@
       forbid: subtype !== 'propcard' && subtype !== 'datacard',
       controlFields: [
         {field: 'emptyExec', notNull: true},
+        {field: 'execDelay', notNull: true},
       ]
+    },
+    {
+      type: 'number',
+      field: 'execDelay',
+      label: '鎵ц寤舵椂',
+      initval: wrap.execDelay,
+      tooltip: '鑷姩鎵ц鎸夐挳鐨勫欢鏃舵墽琛屾椂闂达紝鍗曚綅姣銆�',
+      required: false,
+      forbid: subtype !== 'propcard'
     },
     {
       type: 'radio',
@@ -513,7 +523,6 @@
       ],
       controlFields: [
         {field: 'jumpField', values: ['menu', 'link']},
-        {field: 'joint', values: ['menu', 'link']},
         {field: 'open', values: ['menu', 'link']},
         {field: 'menu', values: ['menu']},
         {field: 'link', values: ['link']},
@@ -526,6 +535,7 @@
       label: '鎺у埗瀛楁',
       initval: wrap.jumpField || '',
       tooltip: '褰撳瓧娈靛�间负true鏃惰Е鍙戣烦杞��',
+      timestamp: new Date().getTime(),
       required: true,
       options: columns,
       forbid: subtype !== 'propcard' || appType !== 'mob'
@@ -545,20 +555,9 @@
       label: '閾炬帴瀛楁',
       initval: wrap.link || '',
       tooltip: '璺宠浆閾炬帴涓烘煡璇㈡暟鎹殑杩斿洖鍊笺��',
+      timestamp: new Date().getTime(),
       required: true,
       options: columns,
-      forbid: subtype !== 'propcard' || appType !== 'mob'
-    },
-    {
-      type: 'radio',
-      field: 'joint',
-      label: '鍙傛暟鎷兼帴',
-      initval: wrap.joint || 'true',
-      required: false,
-      options: [
-        {value: 'true', label: '鏄�'},
-        {value: 'false', label: '鍚�'},
-      ],
       forbid: subtype !== 'propcard' || appType !== 'mob'
     },
     {
@@ -604,6 +603,7 @@
       tooltip: '鐢ㄤ簬鎺у埗琛屾暟鎹槸鍚﹀彲閫夋嫨銆�',
       required: false,
       allowClear: true,
+      joint: true,
       options: columns,
       controlFields: [
         {field: 'controlVal', notNull: true},
@@ -670,20 +670,19 @@
         {value: 'true', label: '鍚敤'},
         {value: 'false', label: '绂佺敤'},
       ],
-      forbid: !!appType || isprint
+      forbid: !!appType || subtype === 'propcard' || isprint
     },
     {
       type: 'radio',
       field: 'searchBtn',
       label: '鎼滅储鎸夐挳',
       initval: wrap.searchBtn || 'hidden',
-      // tooltip: '鍚敤鎼滅储鏉′欢缂撳瓨鍚庯紝鍦ㄨ彍鍗曞埛鏂版椂鎼滅储鏉′欢涓嶅彉銆�',
       required: false,
       options: [
         {value: 'hidden', label: '闅愯棌'},
         {value: 'show', label: '鏄剧ず'},
       ],
-      forbid: appType === 'mob' || isprint,
+      forbid: appType === 'mob' || subtype === 'propcard' || isprint,
     },
     {
       type: 'radio',
@@ -746,7 +745,7 @@
           width: '20%'
         },
         {
-          title: '鑿滃崟',
+          title: '缁勪欢',
           dataIndex: 'nodes',
           inputType: 'cascader',
           editable: true,

--
Gitblit v1.8.0