-
-
+
+
@@ -120,26 +132,31 @@ const components = reactive([
{
key: 'text',
name: '文本',
+ new_name: '',
com_data: text_com_data
},
{
key: 'img',
name: '图片',
+ new_name: '',
com_data: img_com_data,
},
{
key: 'auxiliary-line',
name: '线条',
+ new_name: '',
com_data: line_com_data,
},
{
key: 'icon',
name: '图标',
+ new_name: '',
com_data: icon_com_data,
},
{
key: 'panel',
name: '面板',
+ new_name: '',
com_data: panel_com_data,
},
],
@@ -169,10 +186,53 @@ const diy_data = toRef(props.list);
// on_choose(0, false);
// }
// });
+onMounted(() => {
+ // 监听点击事件
+ document.addEventListener('click', outerClick);
+});
+onUnmounted(() => {
+ // 移除监听事件
+ document.removeEventListener('click', outerClick);
+});
+const edit_index = ref(-1);
+const on_edit = (index: number) => {
+ if (edit_index.value === index) {
+ edit_close_processing(index);
+ edit_index.value = -1;
+ } else {
+ edit_index.value = index;
+ edit_processing(index);
+ }
+};
+// 判断点击的是否是可以点击的区域，其他区域隐藏掉编辑属性
+const outerClick = (e: any) => {
+ if (!e.target.className.includes('do-not-trigger') && !e.target.parentNode.className.includes('do-not-trigger')) {
+ edit_close_processing(edit_index.value);
+ edit_index.value = -1;
+ }
+};
+const double_click = (index: number) => {
+ edit_index.value = index;
+ edit_processing(index);
+};
+// 编辑时的数据处理
+const edit_processing = (index: number) => {
+ const list = diy_data.value[index];
+ if (!isEmpty(list) && isEmpty(list.new_name)) {
+ list.new_name = list.name;
+ }
+};
+//编辑关闭前的处理
+const edit_close_processing = (index: number) => {
+ const list = diy_data.value[index];
+ if (!isEmpty(list) && !isEmpty(list.new_name) && list.new_name === list.name) {
+ list.new_name = '';
+ }
+};
// 复制
const copy = (index: null | number) => {
- if (index) {
+ if (typeof index === 'number' && !isNaN(index)) {
// 获取当前数据, 复制的时候id更换一下
const new_data = {
...cloneDeep(get_diy_index_data(index)),
@@ -186,23 +246,29 @@ const copy = (index: null | number) => {
// 删除
const del = (index: null | number) => {
- if (index) {
+ if (typeof index === 'number' && !isNaN(index)) {
app?.appContext.config.globalProperties.$common.message_box('删除后不可恢复，确定继续吗?', 'warning').then(() => {
ElMessage({
type: 'success',
message: '删除成功!',
});
- // 调用删除接口，然后，更新数据
- diy_data.value.splice(index, 1);
- if (diy_data.value.length > 0) {
- let new_index: number = index;
- // 删除的时候如果大于0，则显示上边的数据
- if (index > 0) {
- new_index = new_index - 1;
+ const show_tabs_index = diy_data.value.findIndex((item: any) => item.show_tabs == '1');
+ // 删除的是当前的这个数据
+ if (show_tabs_index == index) {
+ // 调用删除接口，然后，更新数据
+ diy_data.value.splice(index, 1);
+ if (diy_data.value.length > 0) {
+ let new_index: number = index;
+ // 删除的时候如果大于0，则显示上边的数据
+ if (index > 0) {
+ new_index = new_index - 1;
+ }
+ set_show_tabs(new_index);
+ } else {
+ emits('rightUpdate', {});
}
- set_show_tabs(new_index);
} else {
- emits('rightUpdate', {});
+ diy_data.value.splice(index, 1);
}
});
}
diff --git a/src/components/model-custom/model-custom-content.vue b/src/components/model-custom/model-custom-content.vue
index ccbb2b26..425ca0ed 100644
--- a/src/components/model-custom/model-custom-content.vue
+++ b/src/components/model-custom/model-custom-content.vue
@@ -105,7 +105,7 @@ onBeforeMount(() => {
});
// 处理显示的图片和传递到下去的数据结构
const model_data_source = ref([]);
-const is_show_more = ref(true);
+const is_show_more = ref(false);
const processing_data = (key: string) => {
const list = options.value.filter((item) => item.type == key);
if (list.length > 0) {
diff --git a/src/config/const/goods-list.ts b/src/config/const/goods-list.ts
index dad9054e..956b29c7 100644
--- a/src/config/const/goods-list.ts
+++ b/src/config/const/goods-list.ts
@@ -76,7 +76,7 @@ const defaultProductList: DefaultProductList = {
is_shop_show: '1',
shop_type: 'text',
shop_button_text: '购买',
- shop_button_icon_class: '',
+ shop_button_icon_class: 'cart',
shop_button_effect: '0',
shop_button_size: '1',
},
diff --git a/src/config/const/goods-tabs.ts b/src/config/const/goods-tabs.ts
index 41d188e6..ed07d676 100644
--- a/src/config/const/goods-tabs.ts
+++ b/src/config/const/goods-tabs.ts
@@ -93,7 +93,7 @@ const defaultProductList: DefaultProductList = {
is_price_solo: '1',
shop_type: 'text',
shop_button_text: '购买',
- shop_button_icon_class: '',
+ shop_button_icon_class: 'cart',
shop_button_effect: '0',
shop_button_size: '1',
},