数据源
@@ -54,10 +54,7 @@
-
- 内容设置
- 自定义编辑
-
+ 自定义编辑
@@ -538,4 +535,16 @@ watch(() => data_source_content_value.value, (new_val, old_val) => {
padding: 2.4rem 3rem;
}
}
+.custom-data {
+ background: transparent;
+}
+.custom-button {
+ position: -webkit-sticky;
+ position: sticky;
+ bottom: 0; /* 固定在底部 */
+ background-color: white; /* 设置背景色以避免按钮看不见 */
+ z-index: 1000; /* 确保按钮在其他内容之上 */
+ width: 100%; /* 确保按钮宽度占满父容器 */
+ padding: 1rem; /* 添加一些内边距 */
+}
diff --git a/src/components/model-data-magic/index.vue b/src/components/model-data-magic/index.vue
index 75a6f154..dd7a952a 100644
--- a/src/components/model-data-magic/index.vue
+++ b/src/components/model-data-magic/index.vue
@@ -273,34 +273,34 @@ const default_list = {
** @return {Array}
*/
const commodity_list = (list: any[], num: number, data_content: any, data_style: any) => {
- if (list.length > 0) {
- // 深拷贝一下，确保不会出现问题
- const goods_list = cloneDeep(list).map((item: any) => ({
- ...item.data,
- title: !isEmpty(item.new_title) ? item.new_title : item.data.title,
- new_cover: item.new_cover,
- }));
- // 存储数据显示
- let nav_list: { split_list: any[] }[] = [];
- // 如果是滑动，需要根据每行显示的个数来区分来拆分数据 translation 表示的是平移
- if (data_style.rolling_fashion != 'translation') {
- // 拆分的数量
- const split_num = Math.ceil(goods_list.length / num);
- for (let i = 0; i < split_num; i++) {
- nav_list.push({ split_list: goods_list.slice(i * num, (i + 1) * num) });
- }
- return nav_list;
- } else {
- return rotation_calculation(goods_list, num, data_content, data_style)
+ if (list.length > 0) {
+ // 深拷贝一下，确保不会出现问题
+ const goods_list = cloneDeep(list).map((item: any) => ({
+ ...item.data,
+ title: !isEmpty(item.new_title) ? item.new_title : item.data.title,
+ new_cover: item.new_cover,
+ }));
+ // 存储数据显示
+ let nav_list: { split_list: any[] }[] = [];
+ // 如果是滑动，需要根据每行显示的个数来区分来拆分数据 translation 表示的是平移
+ if (data_style.rolling_fashion != 'translation') {
+ // 拆分的数量
+ const split_num = Math.ceil(goods_list.length / num);
+ for (let i = 0; i < split_num; i++) {
+ nav_list.push({ split_list: goods_list.slice(i * num, (i + 1) * num) });
}
+ return nav_list;
} else {
- const list = Array(num).fill(default_list);
- if (data_style.rolling_fashion != 'translation') {
- return [{ split_list: list }];
- } else {
- return rotation_calculation(list, num, data_content, data_style)
- }
+ return rotation_calculation(goods_list, num, data_content, data_style)
}
+ } else {
+ const list = Array(num).fill(default_list);
+ if (data_style.rolling_fashion != 'translation') {
+ return [{ split_list: list }];
+ } else {
+ return rotation_calculation(list, num, data_content, data_style)
+ }
+ }
}
const rotation_calculation = (list: Array
, num: number, data_content: any, data_style: any) => {
diff --git a/src/components/model-float-window/model-float-window-content.vue b/src/components/model-float-window/model-float-window-content.vue
index 56ffa3d0..58209529 100644
--- a/src/components/model-float-window/model-float-window-content.vue
+++ b/src/components/model-float-window/model-float-window-content.vue
@@ -7,6 +7,7 @@
页面链接
客服入口
+ 快捷导航
diff --git a/src/store/modules/custom.ts b/src/store/modules/custom.ts
index 851de64c..f835be17 100644
--- a/src/store/modules/custom.ts
+++ b/src/store/modules/custom.ts
@@ -18,6 +18,12 @@ export const DataSourceStore = defineStore('dataSource', () => {
const is_data_source_api = ref(false);
// 数据源
const data_source_list = ref([]);
+ // 自定义历史记录
+ const custom_records_index = ref(-1);
+ const custom_records = ref([]);
+ // 自定义组历史记录
+ const custom_group_records_index = ref(-1);
+ const custom_group_records = ref([]);
// 存储上传分类列表
const set_data_source = (data_source_content: data_source_content[]) => {
data_source_list.value = data_source_content;
@@ -31,13 +37,34 @@ export const DataSourceStore = defineStore('dataSource', () => {
const set_is_children_custom = (bool: boolean) => {
is_children_custom.value = bool;
};
-
+ // 设置自定义的历史数据
+ const set_custom_records_index = (index: number) => {
+ custom_records_index.value = index;
+ };
+ const set_custom_records = (records: any[]) => {
+ custom_records.value = records;
+ };
+ // 设置自定义组的历史数据
+ const set_custom_group_records_index = (index: number) => {
+ custom_group_records_index.value = index;
+ };
+ const set_custom_group_records = (records: any[]) => {
+ custom_group_records.value = records;
+ };
return {
+ custom_records,
+ custom_group_records,
+ custom_records_index,
+ custom_group_records_index,
is_children_custom,
data_source_list,
is_data_source_api,
set_data_source,
set_is_data_source_api,
set_is_children_custom,
+ set_custom_records,
+ set_custom_records_index,
+ set_custom_group_records,
+ set_custom_group_records_index,
};
});
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 26407477..7115e38d 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -835,4 +835,29 @@ export const getPlatform = () => {
}
return 'Unknown';
+}
+
+/**
+ * 格式化日期为指定格式的时间字符串
+ *
+ * @param date 日期对象
+ * @param format 格式化字符串，默认为 'YYYY-MM-DD HH:mm:ss'
+ * @returns 格式化后的时间字符串
+ */
+export function formatDate(format: string = 'YYYY-MM-DD HH:mm:ss'): string {
+ const date = new Date();
+ const year = String(date.getFullYear());
+ const month = String(date.getMonth() + 1).padStart(2, '0');
+ const day = String(date.getDate()).padStart(2, '0');
+ const hours = String(date.getHours()).padStart(2, '0');
+ const minutes = String(date.getMinutes()).padStart(2, '0');
+ const seconds = String(date.getSeconds()).padStart(2, '0');
+
+ return format
+ .replace('YYYY', year)
+ .replace('MM', month)
+ .replace('DD', day)
+ .replace('HH', hours)
+ .replace('mm', minutes)
+ .replace('ss', seconds);
}
\ No newline at end of file
diff --git a/src/views/layout/components/settings/index.vue b/src/views/layout/components/settings/index.vue
index 20bd881d..f760703f 100644
--- a/src/views/layout/components/settings/index.vue
+++ b/src/views/layout/components/settings/index.vue
@@ -8,7 +8,7 @@
样式
-
+
@@ -155,7 +155,6 @@ const radio = ref('1'); // 创建一个响应式的数字变量，初始值为0
.setting-content {
height: calc(100vh - 14.8rem);
overflow: auto;
- background-color: #fff;
}
:deep(.el-input-number) {
width: 100%;