Merge remote-tracking branch 'origin/dev-yxl' into dev-sws

src/components/common/drag-group/index.vue

@@ -47,7 +47,7 @@ onUnmounted(() => {
 const edit_index = ref(-1);
 // 判断点击的是否是可以点击的区域，其他区域隐藏掉编辑属性
 const outerClick = (e: any) => {
-    if (!e.target.className.includes('do-not-trigger') && !e.target.parentNode.className.includes('do-not-trigger')) {
+    if (!isEmpty(e.target.className) && !e.target.className.includes('do-not-trigger') && !isEmpty(e.target.parentNode.className) && !e.target.parentNode.className.includes('do-not-trigger')) {
         edit_close_processing(edit_index.value);
         edit_index.value = -1;
     }

src/components/common/magic-cube/index.vue

@@ -3,8 +3,8 @@
         <div class="decorate-cube">
             <ul v-for="(n, index) in densityNum" :key="index" class="cube-col">
                 <li v-for="(i, index1) in densityNum" :key="index1" class="cube-item" :style="{ width: cubeCellWidth + 'px', height: cubeCellHeight + 'px' }" :data-x="n" :data-y="i" @click="onClickCubeItem($event)" @mouseenter="onEnterCubeItem($event)">
-                    <div :class="['w h item', { 'item-selecting': isSelecting(n, i), 'item-selected': isSelected(n, i) }]">
-                        <icon name="add" color="9" :style="{ 'line-height': cubeCellHeight + 'px' }"></icon>
+                    <div :class="['w h item do-not-trigger', { 'item-selecting': isSelecting(n, i), 'item-selected': isSelected(n, i) }]">
+                        <icon name="add" color="9" class="do-not-trigger" :style="{ 'line-height': cubeCellHeight + 'px' }"></icon>
                     </div>
                 </li>
             </ul>
@@ -70,6 +70,7 @@ const selected_active = ref(0);
 //#region 容器大小变更
 const density = ref('4');
 //#endregion
+
 const selectingItem = reactive<any>({
     tempStart: null,
     tempEnd: null,
@@ -77,6 +78,21 @@ const selectingItem = reactive<any>({
     end: null,
 });
 
+onMounted(() => {
+    // 监听点击事件
+    document.addEventListener('click', outerClick);
+});
+onUnmounted(() => {
+    // 移除监听事件
+    document.removeEventListener('click', outerClick);
+});
+// 判断点击的是否是可以点击的区域，其他区域隐藏掉编辑属性
+const outerClick = (e: any) => {
+    if (!isEmpty(e.target.className) && !e.target.className.includes('do-not-trigger')) {
+        clearSelecting();
+    }
+};
+
 const selectedList = ref(props.list);
 
 //单元魔方宽度。

src/components/model-article-tabs/model-article-tabs-content.vue

@@ -28,7 +28,7 @@
                                     <el-input v-model="row.title" placeholder="请输入标题文字" clearable />
                                 </el-form-item>
                                 <template v-if="active_index == index">
-                                    <el-form-item label="简介配置">
+                                    <el-form-item v-if="form.tabs_theme == '1'" label="简介配置">
                                         <el-input v-model="row.desc" placeholder="请输入简介" clearable />
                                     </el-form-item>
                                     <el-form-item label="读取方式">

src/components/model-shop-tabs/model-shop-tabs-content.vue

@@ -28,10 +28,10 @@
                                     <el-input v-model="row.title" placeholder="请输入标题文字" clearable />
                                 </el-form-item>
                                 <template v-if="active_index == index">
-                                    <el-form-item label="上传图片">
+                                    <el-form-item v-if="form.tabs_theme == '4'" label="上传图片">
                                         <upload v-model="row.img" :limit="1" size="40" styles="2"></upload>
                                     </el-form-item>
-                                    <el-form-item label="简介配置">
+                                    <el-form-item v-if="form.tabs_theme == '1'" label="简介配置">
                                         <el-input v-model="row.desc" placeholder="请输入简介" clearable />
                                     </el-form-item>
                                     <el-form-item label="添加商品">