From 674a64c43daac39335d0ef5bd79c1b36ac975c0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=BC=9F=E5=BA=9A?= <zhaoweigeng@wodcloud.com>
Date: Tue, 8 Nov 2022 18:05:24 +0800
Subject: [PATCH] fix some bugs

---
 .beagle.yml                                   | 26 ++++++------
 src/bg-ui/bg-upload-image.vue                 | 40 +++++++++++++++----
 src/bg-ui/bg-upload.vue                       |  7 ++++
 src/bg-ui/index.scss                          | 10 +++--
 src/page/main/develop/account/index.vue       |  8 ++--
 src/page/main/system/organization/index.vue   |  2 +-
 .../main/system/organization/org-form.vue     | 11 +++--
 7 files changed, 70 insertions(+), 34 deletions(-)

diff --git a/.beagle.yml b/.beagle.yml
index 7bff5d3..698ac69 100644
--- a/.beagle.yml
+++ b/.beagle.yml
@@ -41,19 +41,19 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
       - export NODE_ENV=production
       - yarn build
   
-  # - name: s3-cache-build
-  #   image: registry.cn-qingdao.aliyuncs.com/wod/devops-s3-cache:1.0
-  #   network_mode: host
-  #   settings:
-  #     rebuild: true
-  #     hash: package.json
-  #     mount:
-  #       - node_modules
-  #     endpoint: http://cache.wodcloud.com
-  #     access_key:
-  #       from_secret: ACCESS_KEY_MINIO
-  #     secret_key:
-  #       from_secret: SECRET_KEY_MINIO
+  - name: s3-cache-build
+    image: registry.cn-qingdao.aliyuncs.com/wod/devops-s3-cache:1.0
+    network_mode: host
+    settings:
+      rebuild: true
+      hash: package.json
+      mount:
+        - node_modules
+      endpoint: http://cache.wodcloud.com
+      access_key:
+        from_secret: ACCESS_KEY_MINIO
+      secret_key:
+        from_secret: SECRET_KEY_MINIO
 
   - name: docker
     image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
diff --git a/src/bg-ui/bg-upload-image.vue b/src/bg-ui/bg-upload-image.vue
index 1ed93f5..51eb59e 100644
--- a/src/bg-ui/bg-upload-image.vue
+++ b/src/bg-ui/bg-upload-image.vue
@@ -44,6 +44,10 @@
       </div>
     </template>
   </el-upload>
+
+  <el-dialog title="图片预览" v-model="dialogVisible" custom-class="bg-upload-image-dialog">
+    <img style="margin:30px 0;width: 600px;" :src="dialogImageUrl" alt="Preview Image" />
+  </el-dialog>
 </template>
 
 <script>
@@ -59,7 +63,7 @@ export default {
     },
     action: {
       type: String,
-      default: "/apaas/common/file/upload",
+      default: "/apaas/common/image/upload",
     },
     autoUpload: {
       type: Boolean,
@@ -74,7 +78,7 @@ export default {
     },
     multiple: {
       type: Boolean,
-      default: true,
+      default: false,
     },
 
     accept: {
@@ -100,7 +104,7 @@ export default {
       default: "",
     },// 自定义提示内容 
   },
-  emits: ['update:modelValue'],
+  emits: ['update:modelValue',"change"],
   computed: {
     acceptTypes() {
       if (Array.isArray(this.accept)) {
@@ -142,6 +146,8 @@ export default {
     return {
       fileList: [],
       UploadFilled,
+      dialogImageUrl:'',
+      dialogVisible:false
     };
   },
   watch: {
@@ -154,9 +160,22 @@ export default {
       if (newStr !== oldStr) {
         this.fileList = [...this.modelValue];
       }
+      this.$nextTick().then(() => {
+        this.checkLimit(this.modelValue)
+      });
     },
   },
   methods: {
+    checkLimit(filelist) {
+      const limit = this.limit
+      const uploadDom = this.$refs['upload']
+      const length = uploadDom.$el.children[0].children.length
+      if (filelist.length === limit) {
+        uploadDom.$el.children[0].children[length-1].style.display = 'none'
+      } else {
+        uploadDom.$el.children[0].children[length-1]?uploadDom.$el.children[0].children[length-1].style.display = '':''
+      }
+    },
     handleBeforeUpload(file) {
       let units = {
         KB: 1024,
@@ -181,17 +200,21 @@ export default {
     },
     handleSuccess(response, file, fileList) {
       this.updateFileList(fileList);
+      this.checkLimit(fileList)
     },
     handleRemove(file, fileList) {
       this.updateFileList(fileList);
+      this.checkLimit(fileList)
     },
     handlePreview({ name, url }) {
-      let a = document.createElement("a"); // 生成一个a元素
-      let event = new MouseEvent("click"); // 创建一个单击事件
+      this.dialogImageUrl = url
+      this.dialogVisible = true
+      // let a = document.createElement("a"); // 生成一个a元素
+      // let event = new MouseEvent("click"); // 创建一个单击事件
 
-      a.download = name; // 设置图片名称
-      a.href = url; // 将生成的URL设置为a.href属性
-      a.dispatchEvent(event); // 触发a的单击事件
+      // a.download = name; // 设置图片名称
+      // a.href = url; // 将生成的URL设置为a.href属性
+      // a.dispatchEvent(event); // 触发a的单击事件
     },
     updateFileList(fileList) {
       let values = fileList.map((v) => {
@@ -206,6 +229,7 @@ export default {
       console.log(values);
 
       this.$emit("update:modelValue", values);
+      this.$emit("change",values);
     },
     submitUpload() {
       this.$refs.upload.submit();
diff --git a/src/bg-ui/bg-upload.vue b/src/bg-ui/bg-upload.vue
index a243d24..43ebd5f 100644
--- a/src/bg-ui/bg-upload.vue
+++ b/src/bg-ui/bg-upload.vue
@@ -19,6 +19,7 @@
       :disabled="actionDisabled"
       style="max-width: 600px"
       multiple
+      drag
     >
       <!-- <el-button type="primary">
         上传附件
@@ -209,3 +210,9 @@ export default {
   },
 };
 </script>
+<style>
+.bg-upload .el-upload-dragger{
+  padding: 0;
+  border: 0;
+}
+</style>
diff --git a/src/bg-ui/index.scss b/src/bg-ui/index.scss
index ba0a7c9..8196e13 100644
--- a/src/bg-ui/index.scss
+++ b/src/bg-ui/index.scss
@@ -2559,6 +2559,7 @@ a {
   width: 100%;
 
   .el-checkbox {
+    width: 100%;
     .el-checkbox__label {
       overflow: hidden;
       text-overflow: ellipsis;
@@ -2620,7 +2621,7 @@ a {
 }
 
 .bg-permission-option--self {
-  width: 168px;
+  width: 128px;
 
   &.full-option {
     width: 100%;
@@ -2628,7 +2629,7 @@ a {
 }
 
 .bg-permission-option--list {
-  width: calc(100% - 168px);
+  width: calc(100% - 128px);
 
   &.flex-wrap {
     display: flex;
@@ -2640,10 +2641,13 @@ a {
 
     >.bg-permission-option {
       >.bg-permission-option--self {
-        width: 168px;
+        width: 128px;
         border-right: none;
         border-bottom: none;
       }
     }
   }
+}
+.bg-upload-image-dialog {
+  width: 650px;
 }
\ No newline at end of file
diff --git a/src/page/main/develop/account/index.vue b/src/page/main/develop/account/index.vue
index 6c8c998..1bf7128 100644
--- a/src/page/main/develop/account/index.vue
+++ b/src/page/main/develop/account/index.vue
@@ -217,22 +217,21 @@ import CryptoJS from "crypto-js";
         {
           label: "业务系统编码",
           prop: "business_code",
-          width: 180
+          minWidth: 160
         },
         {
           label: "业务系统名称",
           prop: "business_name",
-          minWidth: 180
+          minWidth: 160
         },
         {
           label: "账号",
           prop: "system_account",
-          width: 150
         },
         {
           label: "所属机构",
           prop: "organization_name",
-          width: 240
+          minwidth: 240
         },
         {
           label: "创建时间",
@@ -242,7 +241,6 @@ import CryptoJS from "crypto-js";
         {
           label: "是否启用",
           prop: "state",
-          width: 80
         },
         {
           label: "操作",
diff --git a/src/page/main/system/organization/index.vue b/src/page/main/system/organization/index.vue
index 41b1b52..9bfe46f 100644
--- a/src/page/main/system/organization/index.vue
+++ b/src/page/main/system/organization/index.vue
@@ -969,7 +969,7 @@ import { downloadFileFormatNew } from '@/services/helper'
   bottom: unset
 }
 .dialog_form {
-  padding: 16px;
+  padding: 24px 8px 6px;
 }
 
 </style>
\ No newline at end of file
diff --git a/src/page/main/system/organization/org-form.vue b/src/page/main/system/organization/org-form.vue
index 3e3640f..4b3e2df 100644
--- a/src/page/main/system/organization/org-form.vue
+++ b/src/page/main/system/organization/org-form.vue
@@ -5,7 +5,6 @@
     :model="orgForm"
     :rules="formRules"
     ref="orgRef"
-    style="max-width: 80%"
   >
     <el-form-item label="上级目录" prop="p_organization_id" v-if="formType === 'create'">
       <el-tree-select 
@@ -30,9 +29,13 @@
       <el-input type="textarea" :rows="3" v-model="orgForm.description" />
     </el-form-item>
     <el-form-item label="组织附件" prop="logo">
-       <bg-upload v-model="orgForm.attachment" customTips :limit="3" 
-                  :fileTypes="['doc','docx','xls','xlsx','pdf','jpg','jpeg','png','zip','rar']" 
-                  :otherInfo="'最多可上传三个附件，可上传zip，rar，doc，docx，xlsx，xls，png，jpg，可上传营业执照和相关协议文件等'">
+       <bg-upload 
+          v-model="orgForm.attachment" 
+          customTips 
+          :limit="3" 
+          :fileTypes="['doc','docx','xls','xlsx','pdf','jpg','jpeg','png','zip','rar']" 
+          :otherInfo="'最多可上传三个附件，可上传zip，rar，doc，docx，xlsx，xls，png，jpg，可上传营业执照和相关协议文件等'"
+        >
           <span>将文件拖到此处，或 点击上传</span>
         </bg-upload>
     </el-form-item>
-- 
2.26.0