Skip to content

Commit

Permalink
fix(msg): fix can not resize the editor
Browse files Browse the repository at this point in the history
  • Loading branch information
ysfscream authored and oceanlvr committed Jun 17, 2021
1 parent 81cf6bf commit 7875100
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 19 deletions.
9 changes: 6 additions & 3 deletions src/components/MsgPublish.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
>
<span style="float: left; width: 160px; overflow: hidden; text-overflow: ellipsis">{{ item.topic }}</span>
<span style="color: #8492a6; font-size: 12px; margin-left: 4px">QoS:{{ item.qos }}</span>
<span style="float: right; color: #8492a6; font-size: 13px; margin-left: 4px"
>retain:{{ item.retain ? '1' : '0' }}</span
>
<span style="float: right; color: #8492a6; font-size: 13px; margin-left: 4px">
retain:{{ item.retain ? '1' : '0' }}
</span>
</el-option>
</el-select>
</div>
Expand Down Expand Up @@ -334,10 +334,13 @@ export default class MsgPublish extends Vue {
display: flex;
justify-content: space-around;
.publish-footer {
width: 100%;
flex: 1 1 auto;
}
.publish-right-bar {
width: 85px;
position: absolute;
right: 0;
.history-icon {
width: 70px;
height: 10px;
Expand Down
4 changes: 2 additions & 2 deletions src/components/SubscriptionsList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<div>
<left-panel>
<el-card
v-if="subsVisible"
v-show="subsVisible"
shadow="never"
class="subscriptions-list-view"
:style="{
top: top,
top,
}"
>
<div slot="header" class="clearfix">
Expand Down
3 changes: 1 addition & 2 deletions src/lang/about.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ export default {
emqxDesc: {
zh: '一款完全开源,高可用低时延的百万级分布式物联网 MQTT 5.0 消息服务器。',
// tslint:disable-next-line:max-line-length
en:
'is a fully open source, highly scalable, highly available distributed MQTT 5.0 messaging broker for IoT, M2M and mobile applications.',
en: 'is a fully open source, highly scalable, highly available distributed MQTT 5.0 messaging broker for IoT, M2M and mobile applications.',
ja: 'は完全なオープンソース、高可用性、低レイテンシのミリオンレベルの分散型IoT MQTT 5.0メッセージサーバです。',
},
emqxLocal: {
Expand Down
9 changes: 3 additions & 6 deletions src/lang/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,8 @@ export default {
ja: 'この機能はベータテスト中です',
},
cloud: {
zh:
'需要一个云原生的全托管 MQTT 服务?一键部署 <a href="https://cloud.emqx.cn/?utm_source=mqttx&utm_medium=app&utm_campaign=2021" target="_blank" rel="noopener noreferrer">EMQ X Cloud</a>',
en:
'Need a Cloud-Native fully-managed MQTT broker? Try <a href="https://cloud.emqx.io/?utm_source=mqttx&utm_medium=app&utm_campaign=2021" target="_blank" rel="noopener noreferrer">EMQ X Cloud</a> now!',
ja:
'Need a Cloud-Native fully-managed MQTT broker? Try <a href="https://cloud.emqx.io/?utm_source=mqttx&utm_medium=app&utm_campaign=2021" target="_blank" rel="noopener noreferrer">EMQ X Cloud</a> now!',
zh: '需要一个云原生的全托管 MQTT 服务?一键部署 <a href="https://cloud.emqx.cn/?utm_source=mqttx&utm_medium=app&utm_campaign=2021" target="_blank" rel="noopener noreferrer">EMQ X Cloud</a>',
en: 'Need a Cloud-Native fully-managed MQTT broker? Try <a href="https://cloud.emqx.io/?utm_source=mqttx&utm_medium=app&utm_campaign=2021" target="_blank" rel="noopener noreferrer">EMQ X Cloud</a> now!',
ja: 'Need a Cloud-Native fully-managed MQTT broker? Try <a href="https://cloud.emqx.io/?utm_source=mqttx&utm_medium=app&utm_campaign=2021" target="_blank" rel="noopener noreferrer">EMQ X Cloud</a> now!',
},
}
3 changes: 1 addition & 2 deletions src/lang/connections.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@ export default {
qosSubSysFailed: {
zh: '拒绝了$SYS主题,错误的 QoS,MQTT Broker 拒绝了订阅。请检查 ACL 配置',
en: 'Rejected the $SYS topic,Unexpected QoS, MQTT Broker declined the subscription. Please check ACL configuration',
ja:
'$SYSトピックを拒否しま。した予期しないQoS、MQTT Brokerはサブスクリプションを拒否しました。ACL構成を確認してください',
ja: '$SYSトピックを拒否しま。した予期しないQoS、MQTT Brokerはサブスクリプションを拒否しました。ACL構成を確認してください',
},
qosSubFailed: {
zh: '错误的 QoS, SubACK 失败, 请检查 MQTT broker 设置',
Expand Down
6 changes: 2 additions & 4 deletions src/lang/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,7 @@ export default {
},
autoResubDesc: {
zh: '重连时,对连接的订阅列表进行恢复订阅,仅在 Clean Session 为 True 时有效',
en:
'When reconnecting, the subscription list of the connection will be automatically resubscribed, which is only valid when Clean Session is True',
ja:
'再接続すると、接続のサブスクリプションリストが自動的に再サブスクライブされます。これは、クリーンセッションがTrueの場合にのみ有効です',
en: 'When reconnecting, the subscription list of the connection will be automatically resubscribed, which is only valid when Clean Session is True',
ja: '再接続すると、接続のサブスクリプションリストが自動的に再サブスクライブされます。これは、クリーンセッションがTrueの場合にのみ有効です',
},
}

0 comments on commit 7875100

Please sign in to comment.