From 2c678b536320c0209fe05bbd864f3ebc111f997b Mon Sep 17 00:00:00 2001 From: kuaifan Date: Wed, 23 Feb 2022 22:50:33 +0800 Subject: [PATCH] no message --- package.json | 2 +- resources/assets/js/components/AutoTip.vue | 6 +++++- .../assets/js/pages/manage/components/DialogWrapper.vue | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 906c3b66..f497745e 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "stylus-loader": "^6.2.0", "tinymce": "^5.10.3", "tui-calendar-hi": "^1.15.1-5", - "view-design-hi": "^4.7.0-15", + "view-design-hi": "^4.7.0-16", "vue": "^2.6.14", "vue-clipboard2": "^0.3.3", "vue-emoji-picker": "^1.0.3", diff --git a/resources/assets/js/components/AutoTip.vue b/resources/assets/js/components/AutoTip.vue index a550a4bb..c53cb3af 100644 --- a/resources/assets/js/components/AutoTip.vue +++ b/resources/assets/js/components/AutoTip.vue @@ -4,7 +4,7 @@ :placement="placement" :effect="tooltipTheme" :delay="delay" - :disabled="!showTooltip" + :disabled="!showTooltip || disabled" :max-width="tooltipMaxWidth" transfer> @@ -36,6 +36,10 @@ type: Number, default: 100 }, + disabled: { + type: Boolean, + default: false + }, }, data() { diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index b6766153..c9825f0d 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -95,6 +95,7 @@ :title="$L(pasteTitle)" :cancel-text="$L('取消')" :ok-text="$L('发送')" + :enter-ok="true" @on-ok="pasteSend">