From c474962c844397698544b49a37fd3384725f444c Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 04 十一月 2021 22:09:06 +0800 Subject: [PATCH] 2021-11-04 --- src/menu/components/card/cardsimplecomponent/index.jsx | 2 ++ src/menu/components/carousel/data-card/options.jsx | 2 +- src/menu/components/card/cardcellcomponent/index.jsx | 6 ++++++ src/menu/components/card/data-card/options.jsx | 2 +- src/mob/components/tabs/antv-tabs/options.jsx | 32 ++++++++++++++++---------------- 5 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx index 21ebe15..24a8fa9 100644 --- a/src/menu/components/card/cardcellcomponent/index.jsx +++ b/src/menu/components/card/cardcellcomponent/index.jsx @@ -124,6 +124,12 @@ const { cards, cardCell } = this.props if (!ids || ids.length !== 2 || ids[0] !== cards.uuid || ids[1] !== cardCell.uuid) return + if (window.GLOB.$lock) return + + window.GLOB.$lock = true + setTimeout(() => { + window.GLOB.$lock = false + }, 200) const { elements } = this.state diff --git a/src/menu/components/card/cardsimplecomponent/index.jsx b/src/menu/components/card/cardsimplecomponent/index.jsx index 9267c59..06ae80b 100644 --- a/src/menu/components/card/cardsimplecomponent/index.jsx +++ b/src/menu/components/card/cardsimplecomponent/index.jsx @@ -101,6 +101,8 @@ newcard.padding = '5px' newcard.align = 'left' + window.GLOB.$lock = false + // 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌 MKEmitter.emit('cardAddElement', [cards.uuid, card.uuid], newcard) } diff --git a/src/menu/components/card/data-card/options.jsx b/src/menu/components/card/data-card/options.jsx index 6907ff4..2b629bb 100644 --- a/src/menu/components/card/data-card/options.jsx +++ b/src/menu/components/card/data-card/options.jsx @@ -78,7 +78,7 @@ field: 'pagestyle', label: '鍒嗛〉椋庢牸', initval: wrap.pagestyle || 'page', - tooltip: '鏁版嵁婧愰�夋嫨鍒嗛〉鏃舵湁鏁堛��', + tooltip: '鏁版嵁婧愰�夋嫨鍒嗛〉鏃舵湁鏁堛�傛敞锛氭粦鍔ㄥ姞杞藉彧鏈夌涓�涓湁鏁�', required: false, options: [ {value: 'page', label: '椤电爜'}, diff --git a/src/menu/components/carousel/data-card/options.jsx b/src/menu/components/carousel/data-card/options.jsx index 6aa1852..ce39a9a 100644 --- a/src/menu/components/carousel/data-card/options.jsx +++ b/src/menu/components/carousel/data-card/options.jsx @@ -91,7 +91,7 @@ {value: 'true', label: '鏄�'}, {value: 'false', label: '鍚�'}, ], - forbid: appType !== 'mob' + forbid: true // v5 涓嶆敮鎸佸瀭鐩存樉绀� }, { type: 'radio', diff --git a/src/mob/components/tabs/antv-tabs/options.jsx b/src/mob/components/tabs/antv-tabs/options.jsx index 37bc0c5..e2dd8c8 100644 --- a/src/mob/components/tabs/antv-tabs/options.jsx +++ b/src/mob/components/tabs/antv-tabs/options.jsx @@ -86,22 +86,22 @@ precision: 0, required: true }, - { - type: 'select', - field: 'position', - label: '鏍囩浣嶇疆', - initval: setting.position || 'top', - required: true, - options: [ - {value: 'top', label: 'top'}, - {value: 'bottom', label: 'bottom'}, - {value: 'left', label: 'left'}, - {value: 'right', label: 'right'}, - ], - controlFields: [ - {field: 'display', values: ['top', 'bottom']}, - ] - }, + // { + // type: 'select', + // field: 'position', + // label: '鏍囩浣嶇疆', + // initval: setting.position || 'top', + // required: true, + // options: [ + // {value: 'top', label: 'top'}, + // {value: 'bottom', label: 'bottom'}, + // {value: 'left', label: 'left'}, + // {value: 'right', label: 'right'}, + // ], + // controlFields: [ + // {field: 'display', values: ['top', 'bottom']}, + // ] + // }, { type: 'radio', field: 'display', -- Gitblit v1.8.0