From e3d44b5694b87e8b32d468d8b97fdd409da10b52 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 29 六月 2023 09:23:43 +0800 Subject: [PATCH] Merge branch 'develop' --- src/menu/components/chart/antv-X6/chartcompile/formconfig.jsx | 64 ++++++++++++++++++++++++++++--- 1 files changed, 57 insertions(+), 7 deletions(-) diff --git a/src/menu/components/chart/antv-X6/chartcompile/formconfig.jsx b/src/menu/components/chart/antv-X6/chartcompile/formconfig.jsx index 39827f8..2be6ca1 100644 --- a/src/menu/components/chart/antv-X6/chartcompile/formconfig.jsx +++ b/src/menu/components/chart/antv-X6/chartcompile/formconfig.jsx @@ -1,3 +1,6 @@ + +import MenuUtils from '@/utils/utils-custom.js' + /** * @description 鑾峰彇鍥捐〃瑙嗗浘閰嶇疆琛ㄥ崟 * @param {object} card // 鍥捐〃瀵硅薄 @@ -197,24 +200,71 @@ * @param {object} card // 鍥捐〃瀵硅薄 * @param {Array} columns // 鏄剧ず鍒� */ -export function getOptionForm (card, columns) { +export function getOptionForm (card, uuid) { + let menu = window.GLOB.customMenu + let modules = MenuUtils.getSupModules(menu.components, uuid, menu.interfaces) + return [ { type: 'select', field: 'subtype', - label: '绫诲瀷', + label: '鍥捐〃绫诲瀷', initval: card.subtype || 'xflow', required: true, options: [{ value: 'xflow', label: '娴佺▼鍥�' }, { - value: 'indentTree', + value: 'lane', label: '娉抽亾鍥�' - }, { - value: 'kapmap', - label: '缁勭粐缁撴瀯鍥�' - }] + }], + controlFields: [ + {field: 'gridType', values: ['xflow']}, + {field: 'backgroundColor', values: ['xflow']} + ], + }, + { + type: 'radio', + field: 'function', + label: '鍔熻兘', + initval: card.function || 'show', + required: true, + options: [ + {value: 'edit', label: '娴佺▼缂栬緫'}, + {value: 'show', label: '娴佺▼灞曠ず'}, + ], + controlFields: [ + {field: 'empty', values: ['show']} + ] + }, + { + type: 'cascader', + field: 'supModule', + label: '涓婄骇缁勪欢', + initval: card.supModule || [], + required: false, + options: modules, + allowClear: true + }, + { + type: 'radio', + field: 'gridType', + label: '缃戞牸', + initval: card.gridType || 'none', + required: false, + options: [ + {value: 'none', label: '鏃�'}, + {value: 'dot', label: '鐐圭姸缃戞牸'}, + {value: 'mesh', label: '缃戠姸缃戞牸'} + ], + }, + { + type: 'color', + field: 'backgroundColor', + label: '鑳屾櫙鑹�', + initval: card.backgroundColor || '', + required: false, + allowClear: true }, { type: 'radio', -- Gitblit v1.8.0