aipaw 5 vuotta sitten
vanhempi
commit
d9200a1177

+ 4 - 0
resources/assets/js/main/components/chat/Index.vue

@@ -1465,6 +1465,10 @@
             },
 
             videoConnect(username, videoChat) {
+                if (!$A.leftExists(window.location.protocol, "https")) {
+                    this.$Modal.warning({title: this.$L('温馨提示'), content: this.$L('浏览器阻止音视频访问不是https的网站,所以尝试安装SSL!')});
+                    return;
+                }
                 this.videoChat = videoChat;
                 navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia;
                 try {

+ 14 - 4
resources/assets/js/main/pages/docs.vue

@@ -521,16 +521,17 @@
                 });
             },
 
-            onSectionDelete(sectionId) {
+            onSectionDelete(detail) {
+                let sectionType = this.sectionTypeLists.find((item) => { return item.value == detail.type });
                 this.$Modal.confirm({
                     title: this.$L('删除文档'),
-                    content: this.$L('你确定要删除此文档吗?'),
+                    content: this.$L('你确定要删除%【%】吗?', sectionType ? sectionType.text : '', detail.title),
                     loading: true,
                     onOk: () => {
                         $A.apiAjax({
                             url: 'docs/section/delete',
                             data: {
-                                id: sectionId
+                                id: detail.id
                             },
                             error: () => {
                                 this.$Modal.remove();
@@ -570,11 +571,19 @@
                         break;
 
                     case 'delete':
-                        this.onSectionDelete(detail.id);
+                        if (this.sortDisabled) {
+                            this.$Modal.warning({
+                                title: this.$L('温馨提示'),
+                                content: this.$L('正在进行其他操作,请稍后重试...')
+                            });
+                            return;
+                        }
+                        this.onSectionDelete(detail);
                         break;
 
                     case 'sort':
                         this.sortDisabled = true;
+                        this.loadIng++;
                         $A.apiAjax({
                             url: 'docs/section/sort',
                             data: {
@@ -583,6 +592,7 @@
                             },
                             complete: () => {
                                 this.sortDisabled = false;
+                                this.loadIng--;
                             },
                             error: () => {
                                 this.getSectionLists();

+ 3 - 0
resources/lang/en/general.js

@@ -481,4 +481,7 @@ export default {
     "未保存计划时间": "Unsaved planned time",
     "原计划时间": "Original time",
     "新计划时间": "New time",
+    "你确定要删除%【%】吗?": "Are you sure you want to delete % [%]?",
+    "正在进行其他操作,请稍后重试...": "Other operations in progress, please try again later...",
+    "浏览器阻止不是https的网站访问音视频,所以请尝试安装SSL!": "Browsers prevent sites that are not HTTPS from accessing audio and video, so try installing SSL!",
 }