From 2c1fe210e0bd54127b562bc60d187a6e0d36fd72 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 16 Oct 2024 15:12:57 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=88=A0=E9=99=A4=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/base/drag/index.vue            |  6 +++---
 src/components/base/icon/index.vue            |  2 +-
 src/components/common/hot/index.vue           |  1 -
 .../common/template-import/index.vue          |  2 --
 .../common/upload/form-upload-category.vue    |  5 +++--
 src/components/common/upload/index.vue        |  1 -
 .../common/upload/transform-category.vue      |  3 ---
 src/components/common/upload/upload-model.vue | 20 +++++++------------
 .../model-article-tabs-content.vue            |  1 -
 src/views/layout/components/navbar/index.vue  |  5 +++--
 src/views/layout/index.vue                    |  1 -
 11 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/src/components/base/drag/index.vue b/src/components/base/drag/index.vue
index b4b4442d..81cca228 100644
--- a/src/components/base/drag/index.vue
+++ b/src/components/base/drag/index.vue
@@ -2,10 +2,10 @@
     <VueDraggable v-model="from" :animation="500" target=".sort-target" handle=".icon-drag" :scroll="true" :on-sort="on_sort">
         <TransitionGroup type="transition" tag="ul" name="fade" class="sort-target flex-col gap-x-20">
             <li v-for="(item, index) in from" :key="index" :class="className" class="flex gap-y-16 re" @click="on_click(item, index)">
-                <el-icon class="iconfont icon-drag size-16 cursor-move" />
+                <icon name="drag" size="16" class="cursor-move" />
                 <slot :row="item" :index="index" />
-                <el-icon v-if="type == 'card'" class="iconfont icon-close-fillup size-18 abs c-pointer cr-c top-de-5 right-de-5" @click.stop="remove(index)" />
-                <el-icon v-if="type == 'line'" class="iconfont icon-delete-o size-18 c-pointer do-not-trigger cr-6" @click.stop="remove(index)" />
+                <icon v-if="type == 'card'" name="close-fillup" class="abs c-pointer cr-c top-de-5 right-de-5" size="18" color="6" @click="remove(index)" />
+                <icon v-if="type == 'line'" name="delete-o" class="c-pointer do-not-trigger" size="18" color="6" @click="remove(index)" />
                 <el-dropdown v-if="isShowEdit" placement="bottom">
                     <icon name="more-o" size="18" class="icon-edit-o" color="primary"></icon>
                     <template #dropdown>
diff --git a/src/components/base/icon/index.vue b/src/components/base/icon/index.vue
index 9fc94ccd..1ff945ce 100644
--- a/src/components/base/icon/index.vue
+++ b/src/components/base/icon/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <i class="iconfont" :class="className" :style="'font-size:' + size + 'px;' + (props.color && (props.color.indexOf('#') != -1 || props.color.indexOf('rgba') != -1) ? 'color:' + props.color + ';' : '') + styles" @click="onClick">
+    <i class="iconfont" :class="className" :style="'font-size:' + size + 'px;' + (props.color && (props.color.indexOf('#') != -1 || props.color.indexOf('rgba') != -1) ? 'color:' + props.color + ';' : '') + styles" @click.stop="onClick">
         <slot></slot>
     </i>
 </template>
diff --git a/src/components/common/hot/index.vue b/src/components/common/hot/index.vue
index c5590555..99dcb484 100644
--- a/src/components/common/hot/index.vue
+++ b/src/components/common/hot/index.vue
@@ -392,7 +392,6 @@ const open_hot_event = () => {
             temp_data.img_width = imgBoxRef.value?.clientWidth || 0;
             // 根据原始数据的宽高和更新后的宽高的比例，计算出事实的坐标比例
             const scale = temp_data.img_width / modelValue.value.img_width;
-            console.log(scale);
             temp_data.data.forEach((item) => {
                 item.drag_start.x = item.drag_start.x * scale;
                 item.drag_start.y = item.drag_start.y * scale;
diff --git a/src/components/common/template-import/index.vue b/src/components/common/template-import/index.vue
index afad77e6..499d3e8f 100644
--- a/src/components/common/template-import/index.vue
+++ b/src/components/common/template-import/index.vue
@@ -166,7 +166,6 @@ const upload_file = ref({
 const file_list = ref<UploadFile[]>([]);
 // 文件状态改变时的钩子，添加文件、上传成功和上传失败时都会被调用
 const upload_change = async (uploadFile: UploadFile) => {
-    console.log('文件状态改变时的钩子', uploadFile);
     upload_file.value.name = uploadFile.name || '';
     upload_file.value.size = uploadFile.size || 0;
     file_list.value = [uploadFile];
@@ -241,7 +240,6 @@ const buy_event = (item: any, status: number) => {
         loading.value = true;
         Loading_text.value = '正在获取中...';
         install(new_data);
-        console.log(1);
     }
 };
 interface install_data {
diff --git a/src/components/common/upload/form-upload-category.vue b/src/components/common/upload/form-upload-category.vue
index e2ad0674..02b36c82 100644
--- a/src/components/common/upload/form-upload-category.vue
+++ b/src/components/common/upload/form-upload-category.vue
@@ -130,9 +130,10 @@ const confirm_event = async (formEl: FormInstance | undefined) => {
                 emit('confirm');
             });
             cancel_event(formEl);
-        } else {
-            console.log('error submit!', fields);
         }
+        //  else {
+        //     console.log('error submit!', fields);
+        // }
     });
 };
 </script>
diff --git a/src/components/common/upload/index.vue b/src/components/common/upload/index.vue
index 8b061025..3f6fb16e 100644
--- a/src/components/common/upload/index.vue
+++ b/src/components/common/upload/index.vue
@@ -584,7 +584,6 @@ const del_event = (item: uploadList) => {
             view_list_value.value = view_list_value.value.filter((items: any) => {
                 return items.id != item.id;
             });
-            console.log(view_list_value.value);
         });
     });
 };
diff --git a/src/components/common/upload/transform-category.vue b/src/components/common/upload/transform-category.vue
index eceed778..9873ed12 100644
--- a/src/components/common/upload/transform-category.vue
+++ b/src/components/common/upload/transform-category.vue
@@ -74,7 +74,6 @@ const clear_model_value = () => {
     label.value = '';
     temp_label.value = '';
     cascader_val.value = '';
-    console.log('清空', label.value);
 };
 const temp_label = ref('');
 const cascader_val = ref('');
@@ -90,7 +89,6 @@ const cascader_change = (val: any) => {
 const get_label = (item: any, val: any) => {
     if (!item) return;
     item.forEach((item: any) => {
-        console.log(item.value + '-' + val);
         if (item.value == val) {
             temp_label.value = item.label;
         } else {
@@ -140,7 +138,6 @@ const filterData = (input: string, data: cascaderData[]) => {
 const emit = defineEmits(['call-back']);
 // 确定提交事件
 const confirm = () => {
-    console.log(props.checkImgIds);
     if (props.checkImgIds && category_id.value) {
         app?.appContext.config.globalProperties.$common.message_box('确定转移吗?', 'warning').then(() => {
             // 调用删除接口，然后，更新数据
diff --git a/src/components/common/upload/upload-model.vue b/src/components/common/upload/upload-model.vue
index ccff09bf..aadfb82d 100644
--- a/src/components/common/upload/upload-model.vue
+++ b/src/components/common/upload/upload-model.vue
@@ -302,12 +302,10 @@ const folder_mode = (type: boolean) => {
     }
     nextTick(() => {
         (state.uploadEle as HTMLInputElement).webkitdirectory = type;
-        // console.log(state.uploadEle);
     });
 };
 // 文件状态改变时的钩子，添加文件、上传成功和上传失败时都会被调用
 const upload_change = async (uploadFile: UploadFile, uploadFiles: UploadFiles) => {
-    // console.log('文件状态改变时的钩子', uploadFile, uploadFiles);
     // // 过滤已上传的文件和重复的文件
     const results = uploadFiles.flat(Infinity).filter((f: any) => validExt(f.name) && validSize(f.size));
     const new_upload_files = results.filter((item: UploadFile) => {
@@ -333,10 +331,8 @@ const validSize = (size: number) => size <= props.fileSize;
 const before_upload = (file: any) => {
     // 检查文件是否为图片
     if (validExt(file.name) && validSize(file.size)) {
-        console.log('允许上传');
         return true; // 允许上传
     } else {
-        console.log('不允许上传');
         return false; // 不允许上传
     }
 };
@@ -443,14 +439,12 @@ const del_upload = (index: number) => {
 };
 // 粘贴上传
 const handle_paste = (event: any) => {
-    console.log(event);
     // 获取粘贴板中的文件列表
     const files = event.clipboardData.files;
     // 过滤符合条件的数据   文件后缀名，文件大小过滤
     const results = [...files].filter((f: any) => validExt(f.name) && validSize(f.size));
     // 遍历过滤后的数据，过滤重复数据后并添加到上传列表中
     if (results.length + form.value.file.length <= props.limit) {
-        console.log(results);
         results.forEach((file: any) => {
             // 判断是否重复
             // 如果上传列表中没有与当前文件相同的文件，则添加到上传列表中
@@ -489,9 +483,7 @@ const submit_event = async (formEl: FormInstance | undefined) => {
                 if (item.status == 'ready') {
                     item.status = 'loading';
                     const on_upload_progress = (progressEvent: any) => {
-                        console.log('progressEvent', progressEvent);
                         item.progress = Number(((progressEvent.loaded / progressEvent.total) * 100).toFixed(2));
-                        console.log('1', item.progress);
                     };
                     UploadAPI.uploadAttachment(formData, on_upload_progress)
                         .then((res) => {
@@ -504,9 +496,10 @@ const submit_event = async (formEl: FormInstance | undefined) => {
                         });
                 }
             });
-        } else {
-            console.log('error submit!', fields);
-        }
+        } 
+        // else {
+        //     console.log('error submit!', fields);
+        // }
     });
 };
 
@@ -553,9 +546,10 @@ const extract_images = async (formEl: FormInstance | undefined) => {
             } else {
                 ElMessage.warning('请输入地址后再提取!');
             }
-        } else {
-            console.log('error submit!', fields);
         }
+        //  else {
+        //     console.log('error submit!', fields);
+        // }
     });
 };
 const emit = defineEmits(['closeAll', 'close']);
diff --git a/src/components/model-article-tabs/model-article-tabs-content.vue b/src/components/model-article-tabs/model-article-tabs-content.vue
index 7fc24196..c8049bf5 100644
--- a/src/components/model-article-tabs/model-article-tabs-content.vue
+++ b/src/components/model-article-tabs/model-article-tabs-content.vue
@@ -255,7 +255,6 @@ const article_add = (index: number) => {
 };
 const url_value_dialog_call_back = (item: any[]) => {
     if (url_value_multiple_bool.value) {
-        // console.log(item);
         item.forEach((child: any) => {
             form.tabs_list[article_index.value].data_list.push({
                 id: get_math(),
diff --git a/src/views/layout/components/navbar/index.vue b/src/views/layout/components/navbar/index.vue
index 63b929c5..b7f058b4 100644
--- a/src/views/layout/components/navbar/index.vue
+++ b/src/views/layout/components/navbar/index.vue
@@ -115,9 +115,10 @@ const confirm_event = async (formEl: FormInstance | undefined) => {
                 ...form.value,
                 logo: form.value.logo.length > 0 ? form.value.logo[0].url : '',
             };
-        } else {
-            console.log('error submit!', fields);
         }
+        //  else {
+        //     console.log('error submit!', fields);
+        // }
     });
 };
 </script>
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index e66f15fe..392758a4 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -170,7 +170,6 @@ const default_merge = (data: any, key: string) => {
     if (data.content) {
         data.content = Object.assign({}, cloneDeep((defaultSettings as any)[key.replace(/-/g, '_')]).content, data.content);
     } else {
-        console.log(data.content);
         data.content = cloneDeep((defaultSettings as any)[key.replace(/-/g, '_')]).content;
     }
     return data;