Merge branch 'develop' into revert-11841-revert-11730-feat/captain-image-support
This commit is contained in:
@@ -104,7 +104,6 @@ onMounted(() => {
|
||||
:key="element.id"
|
||||
:macro="element"
|
||||
:conversation-id="conversationId"
|
||||
class="drag-handle cursor-grab"
|
||||
/>
|
||||
</template>
|
||||
</Draggable>
|
||||
|
||||
@@ -54,6 +54,7 @@ const closeMacroPreview = () => {
|
||||
<template>
|
||||
<div
|
||||
class="relative flex items-center justify-between leading-4 rounded-md h-10 pl-3 pr-2"
|
||||
:class="showPreview ? 'cursor-default' : 'drag-handle cursor-grab'"
|
||||
>
|
||||
<span
|
||||
class="overflow-hidden whitespace-nowrap text-ellipsis font-medium text-n-slate-12"
|
||||
|
||||
@@ -73,7 +73,8 @@ class Line::SendOnLineService < Base::SendOnChannelService
|
||||
contents: [
|
||||
{
|
||||
type: 'text',
|
||||
text: message.content
|
||||
text: message.content,
|
||||
wrap: true
|
||||
},
|
||||
*input_select_to_button
|
||||
]
|
||||
|
||||
@@ -112,7 +112,8 @@ describe Line::SendOnLineService do
|
||||
contents: [
|
||||
{
|
||||
type: 'text',
|
||||
text: 'test'
|
||||
text: 'test',
|
||||
wrap: true
|
||||
},
|
||||
{
|
||||
type: 'button',
|
||||
|
||||
Reference in New Issue
Block a user