From 5f193a7474fcbf0257d82bbe07bf18a9d12093e6 Mon Sep 17 00:00:00 2001
From: baishun <baishun@wodcloud.com>
Date: Mon, 27 Feb 2023 10:51:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E8=A7=84=E8=8C=83?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                  |  2 +-
 src/App.vue                   | 14 ++++++++++----
 src/bg-ui/bg-detail-table.vue | 15 ++++++---------
 src/bg-ui/bg-info.vue         |  8 +++-----
 src/bg-ui/bg-layout-card.vue  |  3 +--
 src/bg-ui/bg-list.vue         |  7 ++++---
 src/bg-ui/bg-nav-list.vue     |  2 +-
 src/bg-ui/bg-nav.vue          |  2 +-
 src/bg-ui/bg-rich-text.vue    | 12 ++++--------
 src/bg-ui/bg-table-btns2.vue  |  4 +---
 src/bg-ui/bg-table-pro.vue    |  4 ++--
 src/bg-ui/bg-table.vue        |  2 +-
 src/bg-ui/bg-upload-image.vue |  2 +-
 src/bg-ui/bg-upload.vue       | 15 +++++++--------
 src/bg-ui/debounce.js         |  2 +-
 src/bg-ui/utils/index.js      |  2 +-
 16 files changed, 45 insertions(+), 51 deletions(-)

diff --git a/package.json b/package.json
index 5af2250..a313922 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "build": "vite build",
     "preview": "vite preview",
     "lint": "eslint --ext .js,vue --ignore-pattern '!.*ignore' .",
-    "lint:fix": "eslint --fix && prettier --config .prettierrc --write ."
+    "lint:fix": "prettier --config .prettierrc --write . && yarn lint --fix"
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.0.10",
diff --git a/src/App.vue b/src/App.vue
index f6e0918..cdc9df6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -79,6 +79,8 @@ const info = reactive({
   ],
 });
 
+const aFileList = ref([]);
+
 const { options: btnsOption, currentValue: btnsCurrentValue } = toRefs(btns);
 const { title: cardTitle, icon: cardIcon } = toRefs(card);
 </script>
@@ -220,10 +222,14 @@ const { title: cardTitle, icon: cardIcon } = toRefs(card);
     <cw title="bg-upload-image" />
     <cw title="bg-upload">
       <bg-upload
-        :data="{
-          directory: 'file',
-          uniqueCode: false,
-        }" />
+        v-model="aFileList"
+        :el-attrs="{
+          multiple: false,
+          drag: true,
+        }"
+        :auto="false"
+        :custom-tips="true"
+        :file-types="['zip', 'tgz', 'tar', 'gz']" />
     </cw>
     <cw title="bg-user-upload-image" />
   </div>
diff --git a/src/bg-ui/bg-detail-table.vue b/src/bg-ui/bg-detail-table.vue
index 129d624..006a975 100644
--- a/src/bg-ui/bg-detail-table.vue
+++ b/src/bg-ui/bg-detail-table.vue
@@ -18,17 +18,13 @@
           v-if="!item.urls"
           :title="item.info"
           :style="item.url ? { color: '#515fe7', cursor: 'pointer' } : ''"
-          @click="down_file(item.url)"
-          >{{ item.info }}</span
-        >
+          @click="down_file(item.url)">{{ item.info }}</span>
         <span v-else :title="item.info">
           <span
             v-for="(it, idx) in item.urls"
             :key="'urls' + idx"
             style="color: #515fe7; cursor: pointer"
-            @click="down_file(it)"
-            >{{ helper.downloadFileFormatNew(it) }}、</span
-          >
+            @click="down_file(it)">{{ helper.downloadFileFormatNew(it) }}、</span>
         </span>
       </template>
     </div>
@@ -43,6 +39,7 @@
 <script setup>
 import { reactive, ref, onBeforeMount, toRefs, watch } from "vue";
 import helper from "./utils/index.js";
+
 const props = defineProps({
   data: {
     type: Array,
@@ -50,9 +47,9 @@ const props = defineProps({
   },
   layout: {
     type: Object,
-    default: () => {
-      4;
-    },
+    default: () => ({
+      line_num: 4,
+    }),
   },
 });
 
diff --git a/src/bg-ui/bg-info.vue b/src/bg-ui/bg-info.vue
index 3d40516..5f3fcf2 100644
--- a/src/bg-ui/bg-info.vue
+++ b/src/bg-ui/bg-info.vue
@@ -28,17 +28,15 @@
               width: item.copy
                 ? 'calc(100% - 36px)'
                 : item.download || item.password
-                ? 'calc(100% - 22px)'
-                : '100%',
+                  ? 'calc(100% - 22px)'
+                  : '100%',
               color: item.download ? '#3759be' : '#404a62',
             }">
             <span
               v-if="item.callback"
               class="can_click_text"
               style="text-decoration: underline"
-              @click.stop="item.callback && item.callback()"
-              >{{ item.value }}</span
-            >
+              @click.stop="item.callback && item.callback()">{{ item.value }}</span>
             <span v-else>{{ item.value }}</span>
           </span>
           <a
diff --git a/src/bg-ui/bg-layout-card.vue b/src/bg-ui/bg-layout-card.vue
index 151d169..8a4e766 100644
--- a/src/bg-ui/bg-layout-card.vue
+++ b/src/bg-ui/bg-layout-card.vue
@@ -29,7 +29,7 @@
 <script setup>
 import { reactive, ref, onBeforeMount, toRefs, computed, nextTick } from "vue";
 import html2canvas from "html2canvas";
-
+const emit = defineEmits(["update:btn"]);
 const props = defineProps({
   title: {
     type: String,
@@ -57,7 +57,6 @@ const props = defineProps({
   },
 });
 
-const emit = defineEmits(["update:btn"]);
 const style = computed(() => {
   return {
     width: `calc(${props.width} - 20px)`,
diff --git a/src/bg-ui/bg-list.vue b/src/bg-ui/bg-list.vue
index 06d8f81..be95288 100644
--- a/src/bg-ui/bg-list.vue
+++ b/src/bg-ui/bg-list.vue
@@ -43,7 +43,9 @@
           <el-button type="primary" @click="$emit('search-action')">
             查询
           </el-button>
-          <el-button @click="$emit('search-reset')"> 重置 </el-button>
+          <el-button type="default" @click="$emit('search-reset')">
+            重置
+          </el-button>
         </div>
       </div>
     </div>
@@ -71,6 +73,7 @@
 </template>
 
 <script setup>
+const emit = defineEmits(["update:visible", "search-action", "search-reset"]);
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -85,6 +88,4 @@ const props = defineProps({
     default: false,
   },
 });
-
-const emit = defineEmits(["update:visible", "search-action", "search-reset"]);
 </script>
diff --git a/src/bg-ui/bg-nav-list.vue b/src/bg-ui/bg-nav-list.vue
index 89a944a..7764587 100644
--- a/src/bg-ui/bg-nav-list.vue
+++ b/src/bg-ui/bg-nav-list.vue
@@ -81,7 +81,7 @@ const props = defineProps({
   },
   highlightParentRule: {
     type: Function,
-    default: () => null,
+    default: () => {},
   },
 });
 
diff --git a/src/bg-ui/bg-nav.vue b/src/bg-ui/bg-nav.vue
index 1f18e4c..b26a2a2 100644
--- a/src/bg-ui/bg-nav.vue
+++ b/src/bg-ui/bg-nav.vue
@@ -27,7 +27,7 @@ const props = defineProps({
   }, // 导航列表 [ { name: "xxx", path: "xxx" } ]
   highlightParentRule: {
     type: Function,
-    default: () => null,
+    default: () => {},
   },
 });
 </script>
diff --git a/src/bg-ui/bg-rich-text.vue b/src/bg-ui/bg-rich-text.vue
index 83812cd..3876373 100644
--- a/src/bg-ui/bg-rich-text.vue
+++ b/src/bg-ui/bg-rich-text.vue
@@ -18,8 +18,10 @@
 
 <script setup>
 import "@wangeditor/editor/dist/css/style.css"; // 引入 css
+
 import { onBeforeUnmount, ref, shallowRef, onMounted } from "vue";
 import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
+
 import { useFormItem } from "element-plus";
 
 const props = defineProps({
@@ -36,14 +38,8 @@ const props = defineProps({
     default: "default",
   },
 });
-const emit = defineEmits([
-  "update:modelValue",
-  "update:visible",
-  "search-action",
-  "search-reset",
-  "change",
-  "blur",
-]);
+
+const emit = defineEmits(["update:modelValue", "change", "blur"]);
 
 const valueHtml = ref("");
 // change次数
diff --git a/src/bg-ui/bg-table-btns2.vue b/src/bg-ui/bg-table-btns2.vue
index 0c7e6a3..2d2c224 100644
--- a/src/bg-ui/bg-table-btns2.vue
+++ b/src/bg-ui/bg-table-btns2.vue
@@ -20,9 +20,7 @@
             v-for="(item, index) in state.lastChildren"
             :key="'as' + index"
             :class="item.disabled ? 'disabled' : ''"
-            @click="action(item.onClick, item.disabled)"
-            >{{ item.name }}</span
-          >
+            @click="action(item.onClick, item.disabled)">{{ item.name }}</span>
         </div>
       </teleport>
     </span>
diff --git a/src/bg-ui/bg-table-pro.vue b/src/bg-ui/bg-table-pro.vue
index d5b1228..86189fc 100644
--- a/src/bg-ui/bg-table-pro.vue
+++ b/src/bg-ui/bg-table-pro.vue
@@ -72,8 +72,8 @@ const attrs = useAttrs();
 const props = defineProps({
   headers: {
     type: Array,
-    default: () => [],
     require: true,
+    default: () => [],
   },
   data: {
     type: Array,
@@ -93,7 +93,7 @@ const props = defineProps({
   },
   selectable: {
     type: Function,
-    default: () => null,
+    default: () => {},
   },
   defaultExpandAll: {
     type: Boolean,
diff --git a/src/bg-ui/bg-table.vue b/src/bg-ui/bg-table.vue
index 43b26fa..bef6454 100644
--- a/src/bg-ui/bg-table.vue
+++ b/src/bg-ui/bg-table.vue
@@ -111,8 +111,8 @@ const props = defineProps({
   },
   headers: {
     type: Array,
-    default: () => [],
     require: true,
+    default: () => [],
   },
   rows: {
     type: Array,
diff --git a/src/bg-ui/bg-upload-image.vue b/src/bg-ui/bg-upload-image.vue
index ce10146..7fcdc0b 100644
--- a/src/bg-ui/bg-upload-image.vue
+++ b/src/bg-ui/bg-upload-image.vue
@@ -96,7 +96,7 @@ const props = defineProps({
   }, // 接受类型
   fileSize: {
     type: Number,
-    default: 2048,
+    default: 1024,
   }, // 文件大小
   fileSizeUnit: {
     type: String,
diff --git a/src/bg-ui/bg-upload.vue b/src/bg-ui/bg-upload.vue
index 7255c46..4895901 100644
--- a/src/bg-ui/bg-upload.vue
+++ b/src/bg-ui/bg-upload.vue
@@ -3,7 +3,6 @@
     class="bg-upload"
     :class="{ 'is-disabled': actionDisabled, 'is-easy': isEasy }">
     <el-upload
-      ref="uploadRef"
       :action="actionUrl"
       :data="actionData"
       :name="actionName"
@@ -27,7 +26,7 @@
         支持上传{{ fileTypes.join("、") }}，最大{{ fileMaxSize }}M
       </div> -->
       <template v-if="isEasy">
-        <el-button type="primary" size="mini">
+        <el-button type="primary" size="small">
           <bg-icon
             v-if="triggerIcon"
             :icon="`#${triggerIcon}`"
@@ -68,7 +67,6 @@ import {
   toRefs,
 } from "vue";
 import { ElMessage } from "element-plus";
-
 const props = defineProps({
   modelValue: {
     type: Array,
@@ -144,8 +142,6 @@ const props = defineProps({
 
 const emit = defineEmits(["update:modelValue", "change", "delete"]);
 
-const uploadRef = ref(null);
-
 const state = reactive({
   fileList: [],
   initFileList: [],
@@ -176,7 +172,11 @@ watch(
       .join(",");
 
     if (newStr !== oldStr) {
-      state.fileList = [...props.modelValue];
+      let newFileList = [];
+      props.modelValue.forEach((file) => {
+        newFileList.push({ name: file.name, url2: file.url });
+      });
+      state.fileList = newFileList;
     }
   }
 );
@@ -226,7 +226,7 @@ const updateFileList = (fileList) => {
     if (props.saveType == "url") {
       return {
         name: v.name,
-        url: (v.response && v.response.data) || v.url || v.raw,
+        url: (v.response && v.response.data) || v.url2 || v.raw,
       };
     } else {
       return {
@@ -243,7 +243,6 @@ const updateFileList = (fileList) => {
 };
 
 const onChangeFile = (file, fileList) => {
-  console.log(file, fileList);
   if (!handleBeforeUpload(file.raw)) {
     state.fileList = state.fileList.filter(({ uid }) => file.uid !== uid);
     return;
diff --git a/src/bg-ui/debounce.js b/src/bg-ui/debounce.js
index 579788c..2ac404a 100644
--- a/src/bg-ui/debounce.js
+++ b/src/bg-ui/debounce.js
@@ -81,7 +81,7 @@ export default {
       });
       return vnode;
     } catch (error) {
-      console.error(error);
+      log.error(error);
     }
   },
 };
diff --git a/src/bg-ui/utils/index.js b/src/bg-ui/utils/index.js
index 07885aa..58d0410 100644
--- a/src/bg-ui/utils/index.js
+++ b/src/bg-ui/utils/index.js
@@ -1,4 +1,4 @@
-var downloadFileFormatNew = function (fileUrl) {
+var downloadFileFormatNew = function(fileUrl) {
   /* 
       input: /apaas/common/docs/image/images/1234_qq234ewr123.png
       output: 1234.png
-- 
2.26.0