merge test

src/components/DialogForm/index.vue

@@ -143,9 +143,12 @@ function findMaxLabelWidth(rows) {
 			if (!opt.label) return 0;
 			if (opt.label.length > max) {
 				max = opt.label.length;
+<<<<<<< HEAD
 				if (opt.label.includes('(')) {
 					max = max - 3;
 				}
+=======
+>>>>>>> projects/mesxc-test
 			}
 		});
 	});

src/components/Editor/index.vue

@@ -83,7 +83,7 @@ export default {
 					],
 				},
 				placeholder: '请输入内容',
-				// readOnly: false,
+				readOnly: true,
 			},
 		};
 	},
@@ -123,7 +123,6 @@ export default {
 			const editor = this.$refs.editor;
 			this.Quill = new Quill(editor, this.options);
 			// 取消自动聚焦 start
-			this.Quill?.enable(false);
 			this.$nextTick(() => {
 				this.Quill?.blur();
 				this.Quill?.enable(true);
@@ -195,7 +194,7 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style>
 .editor-wrapper {
 	position: relative;
   cursor: not-allowed;

src/components/ImageUpload/index.vue

@@ -15,6 +15,7 @@
         :headers="headers"
         :file-list="fileList"
         :on-preview="handlePictureCardPreview"
+        :disabled="disabled"
         :class="{hide: this.fileList.length >= this.limit}"
     >
       <i class="el-icon-plus"></i>
@@ -44,6 +45,7 @@
 
 <script>
 import { getAccessToken } from "@/utils/auth";
+import { flatten } from 'min-dash';
 
 export default {
   props: {
@@ -67,6 +69,10 @@ export default {
     isShowTip: {
       type: Boolean,
       default: true
+    },
+    disabled: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -122,14 +128,16 @@ export default {
     // 上传成功回调
     handleUploadSuccess(res) {
       // edit by 芋道源码
-      this.uploadList.push({ name: res.data, url: res.data });
-      if (this.uploadList.length === this.number) {
-        this.fileList = this.fileList.concat(this.uploadList);
-        this.uploadList = [];
-        this.number = 0;
-        this.$emit("input", this.listToString(this.fileList));
-        this.$modal.closeLoading();
+      if (res.code !== 500) {
+        this.uploadList.push({ name: res.data, url: res.data });
+        if (this.uploadList.length === this.number) {
+          this.fileList = this.fileList.concat(this.uploadList);
+          this.uploadList = [];
+          this.number = 0;
+          this.$emit("input", this.listToString(this.fileList));
+        }
       }
+      this.$modal.closeLoading();
     },
     // 上传前loading加载
     handleBeforeUpload(file) {

src/components/Verifition/Verify/VerifySlide.vue

@@ -360,7 +360,6 @@ export default {
         ts: Date.now(), // 现在的时间戳
       }
       reqGet(data).then(res => {
-        console.log(1)
         if (res.repCode === '0000') {
           this.backImgBase = res.repData.originalImageBase64
           this.blockBackImgBase = res.repData.jigsawImageBase64