Merge branch 'dev-sws' into dev-yxl

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

@@ -2,7 +2,7 @@
     <drag :data="drag_list" :space-col="20" :is-show-edit="true" @remove="remove" @on-sort="on_sort" @edit="edit" @replace="replace">
         <template #default="{ row, index }">
             <upload v-model="row.new_cover" :limit="1" size="40" styles="2"></upload>
-            <el-image :src="row.data[imgParams]" fit="contain" class="img">
+            <el-image :src="row.data[imgParams]" fit="contain" class="img radius-xs">
                 <template #error>
                     <div class="bg-f5 flex-row jc-c align-c radius h w">
                         <icon name="error-img" size="16" color="9"></icon>

src/components/common/preview/index.vue

@@ -11,7 +11,7 @@
     </el-dialog>
 </template>
 <script setup lang="ts">
-import { get_cookie } from '@/utils';
+import { get_cookie, get_math } from '@/utils';
 const props = defineProps({
     dataId: {
         type: String,
@@ -40,7 +40,7 @@ watch(
     () => dialog_visible.value,
     (newVal) => {
         if (newVal) {
-            new_link.value = (import.meta.env.VITE_APP_BASE_API == '/dev-api' ? import.meta.env.VITE_APP_BASE_API_URL : pro_url) + '?s=diy/preview/id/' + props.dataId + '&system_type=default' + token.value;
+            new_link.value = (import.meta.env.VITE_APP_BASE_API == '/dev-api' ? import.meta.env.VITE_APP_BASE_API_URL : pro_url) + '?s=diy/preview/id/' + props.dataId + '&system_type=default' + token.value + '&uid=' + get_math();
         }
     }
 );

src/components/common/tabs-view/index.vue

@@ -160,7 +160,7 @@ const icon_tabs_check = () => {
                 opacity: 0.6;
                 bottom: 0.8rem;
                 z-index: 0;
-                height: 0.7rem;
+                height: 0.6rem;
                 border-radius: 0;
                 width: 76%;
                 left: 12%;

src/components/footer-nav/footer-nav-content.vue

@@ -62,6 +62,12 @@ import { get_math } from '@/utils';
 import DiyAPI from '@/api/tabbar';
 import defaultFooterNav from '@/config/const/footer-nav';
 const app = getCurrentInstance();
+/**
+ * @description: 底部导航（内容）
+ * @param value{Object} 传过来的数据，用于数据渲染
+ * @param footerStyle{Object} 底部导航样式
+ * @param footerDialogPositionTop{Number} 底部导航弹窗样式
+ */
 const props = defineProps({
     value: {
         type: Object,
@@ -78,21 +84,26 @@ const props = defineProps({
 });
 const form = ref(props.value);
 const emit = defineEmits(['update:value']);
+// 导航样式change事件
 const nav_style_change = (style: any) => {
     form.value.nav_style = style;
     emit('update:value', form.value);
 };
+// 导航类型change事件
 const nav_type_change = (type: any) => {
     form.value.nav_type = type;
     emit('update:value', form.value);
 };
+// data_list移除事件
 const nav_content_remove = (index: number) => {
     form.value.nav_content.splice(index, 1);
     emit('update:value', form.value);
 };
+// 拖拽排序事件
 const on_sort = (item: any) => {
     form.value.nav_content = item;
 };
+// 添加导航
 const add = () => {
     form.value.nav_content.push({
         id: get_math(),

src/components/footer-nav/footer-nav-setting.vue

@@ -9,6 +9,12 @@
     </div>
 </template>
 <script setup lang="ts">
+/**
+ * @description: 底部导航（切换）
+ * @param type{String} 类型是进入内容组件还是样式组件
+ * @param value{Object} 底部导航样式
+ * @param footerDialogPositionTop{Number} 底部导航弹窗样式
+ */
 const props = defineProps({
     type: {
         type: String,
@@ -25,6 +31,7 @@ const props = defineProps({
 });
 const form = ref(props.value);
 const emit = defineEmits(['update:value']);
+// 内容更新回调事件
 const content_update = (value: any) => {
     form.value.content = value;
     const new_arry = ['margin', 'margin_left', 'margin_right', 'margin_top', 'margin_bottom', 'padding', 'padding_left', 'padding_right', 'padding_top', 'padding_bottom', 'radius', 'radius_top_left', 'radius_top_right', 'radius_bottom_left', 'radius_bottom_right'];

src/components/footer-nav/footer-nav-styles.vue

@@ -16,7 +16,10 @@
     </div>
 </template>
 <script setup lang="ts">
-import { omit } from 'lodash';
+/**
+ * @description: 底部导航（样式）
+ * @param value{Object} 传过来的数据，用于数据渲染
+ */
 const props = defineProps({
     value: {
         type: Object,

src/components/footer-nav/index.vue

@@ -23,6 +23,11 @@
 import { common_img_computer, common_styles_computer } from '@/utils';
 import { footerNavCounterStore } from '@/store';
 const footer_nav_counter_store = footerNavCounterStore();
+/**
+ * @description: 底部导航（渲染）
+ * @param showFooter{Boolean} 是否显示底部导航
+ * @param footerData{Object} 底部导航数据
+ */
 const props = defineProps({
     showFooter: {
         type: Boolean,

src/components/model-article-list/index.vue

@@ -56,6 +56,11 @@
 import { common_styles_computer, padding_computer, radius_computer, get_math, is_obj_empty, common_img_computer } from '@/utils';
 import { isEmpty, cloneDeep } from 'lodash';
 import ArticleAPI from '@/api/article';
+/**
+ * @description: 文章列表（渲染）
+ * @param value{Object} 样式数据
+ * @param isCommonStyle{Object} 是否为通用样式
+ */
 const props = defineProps({
     value: {
         type: Object,

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

@@ -69,6 +69,12 @@
 import { get_math } from '@/utils';
 import { commonStore } from '@/store';
 const common_store = commonStore();
+/**
+ * @description 文章列表（内容）
+ * @param value{Object} 传过来的数据，用于数据渲染
+ * @param styles{Object} 样式
+ * @param defaultConfig{Object} 默认配置
+ */
 const props = defineProps({
     value: {
         type: Object,
@@ -135,6 +141,7 @@ onMounted(() => {
         }
     });
 });
+// 主题改变
 const theme_change = (val: any) => {
     if (val == '3' || val == '4') {
         form.value.field_show = ['1'];
@@ -159,19 +166,23 @@ const theme_change = (val: any) => {
         }
     }
 };
+// 移除
 const data_list_remove = (index: number) => {
     form.value.data_list.splice(index, 1);
 };
 const url_value_multiple_bool = ref(true);
 const data_list_replace_index = ref(0);
+// 替换
 const data_list_replace = (index: number) => {
     data_list_replace_index.value = index;
     url_value_multiple_bool.value = false;
     url_value_dialog_visible.value = true;
 };
+// 拖动排序
 const data_list_sort = (item: any) => {
     form.value.data_list = item;
 };
+//  新增
 const add = () => {
     url_value_multiple_bool.value = true;
     url_value_dialog_visible.value = true;

src/components/model-article-list/model-article-list-setting.vue

@@ -9,6 +9,11 @@
     </div>
 </template>
 <script setup lang="ts">
+/**
+ * @description: 文章列表（切换）
+ * @param type{String} 类型是进入内容组件还是样式组件
+ * @param value{Object} 样式数据
+ */
 const props = defineProps({
     type: {
         type: String,

src/components/model-article-list/model-article-list-styles.vue

@@ -57,6 +57,12 @@
     </div>
 </template>
 <script setup lang="ts">
+/**
+ * @description: 文章列表（样式）
+ * @param value{Object} 样式数据
+ * @param content{Object} 内容数据
+ * @param defaultConfig{Object} 默认配置
+ */
 const props = defineProps({
     value: {
         type: Object,

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

@@ -11,7 +11,10 @@
 <script setup lang="ts">
 import { common_img_computer, common_styles_computer } from '@/utils';
 import { cloneDeep } from 'lodash';
-
+/**
+ * @description: 文章选项啊哭列表（渲染）
+ * @param value{Object} 样式数据
+ */
 const props = defineProps({
     value: {
         type: Object,