diff --git a/app/layout/service/BaseLayout.php b/app/layout/service/BaseLayout.php index d1e38e644..608d6734b 100644 --- a/app/layout/service/BaseLayout.php +++ b/app/layout/service/BaseLayout.php @@ -92,11 +92,23 @@ class BaseLayout { foreach($config as &$v) { + // 配置信息处理 + if(!empty($v['config'])) + { + $v['config'] = self::ConfigSaveFieldHandle($v['config']); + } + // 布局 if(!empty($v['children']) && is_array($v['children'])) { foreach($v['children'] as &$vs) { + // 配置信息处理 + if(!empty($vs['config'])) + { + $vs['config'] = self::ConfigSaveFieldHandle($vs['config']); + } + // 容器 if(!empty($vs['children']) && is_array($vs['children'])) { @@ -105,6 +117,9 @@ class BaseLayout { if(!empty($vss['value']) && !empty($vss['config'])) { + // 配置信息处理 + $vss['config'] = self::ConfigSaveFieldHandle($vss['config']); + // 根据模块类型处理 switch($vss['value']) { @@ -204,6 +219,12 @@ class BaseLayout { foreach($config as &$v) { + // 配置信息处理 + if(!empty($v['config'])) + { + $v['config'] = self::ConfigViewFieldHandle($v['config']); + } + // 布局类型 $v['value_arr'] = explode(':', $v['value']); @@ -212,6 +233,12 @@ class BaseLayout { foreach($v['children'] as &$vs) { + // 配置信息处理 + if(!empty($vs['config'])) + { + $vs['config'] = self::ConfigViewFieldHandle($vs['config']); + } + // 容器 if(!empty($vs['children']) && is_array($vs['children'])) { @@ -220,11 +247,8 @@ class BaseLayout { if(!empty($vss['value']) && !empty($vss['config'])) { - // 滚动配置 - if(array_key_exists('view_list_show_style_value', $vss['config'])) - { - $vss['config']['view_list_show_style_value_arr'] = empty($vss['config']['view_list_show_style_value']) ? '' : json_decode(urldecode($vss['config']['view_list_show_style_value']), true); - } + // 配置信息处理 + $vss['config'] = self::ConfigViewFieldHandle($vss['config']); // 根据模块类型处理 switch($vss['value']) @@ -337,184 +361,171 @@ class BaseLayout { if(!empty($config)) { - // 缓存key - $cache_key = md5(is_array($config) ? json_encode($config, JSON_UNESCAPED_UNICODE) : $config).APPLICATION_CLIENT_TYPE; - $data = MyCache($cache_key); - if(empty($data) || MyEnv('app_debug')) + // 是否数组 + if(!is_array($config)) { - // 是否数组 - if(!is_array($config)) + $config = json_decode($config, true); + } + if(!empty($config)) + { + foreach($config as &$v) { - $config = json_decode($config, true); - } - if(!empty($config)) - { - foreach($config as &$v) + // 配置信息处理 + if(!empty($v['config'])) { - // 配置信息处理 - if(!empty($v['config'])) + $v['config'] = self::ConfigViewFieldHandle($v['config'], true); + } + + // 布局类型 + $v['value_arr'] = explode(':', $v['value']); + + // 布局 + if(!empty($v['children']) && is_array($v['children'])) + { + foreach($v['children'] as &$vs) { // 配置信息处理 - $v['config'] = self::ConfigViewFieldHandle($v['config']); - } - - // 布局类型 - $v['value_arr'] = explode(':', $v['value']); - - // 布局 - if(!empty($v['children']) && is_array($v['children'])) - { - foreach($v['children'] as &$vs) + if(!empty($vs['config'])) { - // 配置信息处理 - if(!empty($vs['config'])) - { - // 配置信息处理 - $vs['config'] = self::ConfigViewFieldHandle($vs['config']); - } + $vs['config'] = self::ConfigViewFieldHandle($vs['config'], true); + } - // 容器 - if(!empty($vs['children']) && is_array($vs['children'])) + // 容器 + if(!empty($vs['children']) && is_array($vs['children'])) + { + // 模块 + foreach($vs['children'] as &$vss) { - // 模块 - foreach($vs['children'] as &$vss) + if(!empty($vss['value']) && !empty($vss['config'])) { - if(!empty($vss['value']) && !empty($vss['config'])) + // 配置信息处理 + $vss['config'] = self::ConfigViewFieldHandle($vss['config'], true); + + // 根据模块类型处理 + switch($vss['value']) { - // 配置信息处理 - $vss['config'] = self::ConfigViewFieldHandle($vss['config']); + // 视频 video + case 'video' : + $vss['config']['video'] = ResourcesService::AttachmentPathViewHandle($vss['config']['content_video']); + unset($vss['config']['content_video']); + break; - // 根据模块类型处理 - switch($vss['value']) - { - // 视频 video - case 'video' : - $vss['config']['video'] = ResourcesService::AttachmentPathViewHandle($vss['config']['content_video']); - unset($vss['config']['content_video']); - break; + // 单图 images + case 'images' : + // 配置重新组合 + $vss['config'] = [ + 'frontend_config' => $vss['config']['frontend_config'], + 'images' => ResourcesService::AttachmentPathViewHandle($vss['config']['content_images']), + 'url' => self::LayoutUrlValueHandle($vss['config']['content_to_type'], $vss['config']['content_to_value']), + ]; + break; - // 单图 images - case 'images' : - // 配置重新组合 - $vss['config'] = [ - 'frontend_config' => $vss['config']['frontend_config'], - 'images' => ResourcesService::AttachmentPathViewHandle($vss['config']['content_images']), - 'url' => self::LayoutUrlValueHandle($vss['config']['content_to_type'], $vss['config']['content_to_value']), + // 多图 many-images + case 'many-images' : + foreach($vss['config']['data_list'] as &$mil) + { + $mil = [ + 'images' => ResourcesService::AttachmentPathViewHandle($mil['images']), + 'url' => self::LayoutUrlValueHandle($mil['type'], $mil['value']), ]; - break; + } + break; - // 多图 many-images - case 'many-images' : - foreach($vss['config']['data_list'] as &$mil) + // 图文 images-text + case 'images-text' : + foreach($vss['config']['data_list'] as &$itl) + { + $itl['images'] = ResourcesService::AttachmentPathViewHandle($itl['images']); + $itl['url'] = self::LayoutUrlValueHandle($itl['type'], $itl['value']); + } + break; + + // 图片魔方 images-magic-cube + case 'images-magic-cube' : + foreach($vss['config']['data_list'] as &$imc) + { + $imc['images'] = ResourcesService::AttachmentPathViewHandle($imc['images']); + $imc['url'] = self::LayoutUrlValueHandle($imc['type'], $imc['value']); + } + break; + + // 商品 + case 'goods' : + $p = [ + 'data_type' => $vss['config']['goods_data_type'], + ]; + switch($vss['config']['goods_data_type']) + { + // 指定商品 + case 'goods' : + $p['goods_ids'] = $vss['config']['goods_ids']; + break; + + // 商品分类 + case 'category' : + $category = json_decode(urldecode($vss['config']['goods_category_value']), true); + $p['category_id'] = $category[count($category)-1]['id']; + $p['order_limit_number'] = empty($vss['config']['goods_order_limit_number']) ? 0 : $vss['config']['goods_order_limit_number']; + $p['order_by_type'] = isset($vss['config']['goods_order_by_type']) ? $vss['config']['goods_order_by_type'] : 0; + $p['order_by_rule'] = isset($vss['config']['goods_order_by_rule']) ? $vss['config']['goods_order_by_rule'] : 0; + break; + } + $res = self::GoodsDataList($p); + if(!empty($res['data']) && is_array($res['data'])) + { + foreach($res['data'] as &$g) { - $mil = [ - 'images' => ResourcesService::AttachmentPathViewHandle($mil['images']), - 'url' => self::LayoutUrlValueHandle($mil['type'], $mil['value']), + $g['goods_url'] = self::LayoutUrlValueHandle('goods', $g); + } + } + $vss['config']['data_list'] = $res['data']; + break; + + // 标题 + case 'title' : + // 关键字 + $keywords_list = []; + if(!empty($vss['config']['keywords_list'])) + { + foreach($vss['config']['keywords_list'] as $wd) + { + $keywords_list[] = [ + 'keywords' => $wd['content_keywords'], + 'color' => empty($wd['style_keywords_color']) ? '' : $wd['style_keywords_color'], + 'url' => self::LayoutUrlValueHandle($wd['content_to_type'], $wd['content_to_value']), ]; } - break; + } - // 图文 images-text - case 'images-text' : - foreach($vss['config']['data_list'] as &$itl) - { - $itl['images'] = ResourcesService::AttachmentPathViewHandle($itl['images']); - $itl['url'] = self::LayoutUrlValueHandle($itl['type'], $itl['value']); - } - break; + // 配置重新组合 + $vss['config'] = [ + 'frontend_config' => $vss['config']['frontend_config'], + 'title' => $vss['config']['content_title'], + 'title_vice' => $vss['config']['content_title_vice'], + 'title_more' => $vss['config']['content_title_more'], + 'title_more_url' => self::LayoutUrlValueHandle($vss['config']['content_to_type'], $vss['config']['content_to_value']), + 'keywords_list' => $keywords_list, + ]; + break; - // 图片魔方 images-magic-cube - case 'images-magic-cube' : - foreach($vss['config']['data_list'] as &$imc) - { - $imc['images'] = ResourcesService::AttachmentPathViewHandle($imc['images']); - $imc['url'] = self::LayoutUrlValueHandle($imc['type'], $imc['value']); - } - break; - - // 商品 - case 'goods' : - $p = [ - 'data_type' => $vss['config']['goods_data_type'], - ]; - switch($vss['config']['goods_data_type']) - { - // 指定商品 - case 'goods' : - $p['goods_ids'] = $vss['config']['goods_ids']; - break; - - // 商品分类 - case 'category' : - $category = json_decode(urldecode($vss['config']['goods_category_value']), true); - $p['category_id'] = $category[count($category)-1]['id']; - $p['order_limit_number'] = empty($vss['config']['goods_order_limit_number']) ? 0 : $vss['config']['goods_order_limit_number']; - $p['order_by_type'] = isset($vss['config']['goods_order_by_type']) ? $vss['config']['goods_order_by_type'] : 0; - $p['order_by_rule'] = isset($vss['config']['goods_order_by_rule']) ? $vss['config']['goods_order_by_rule'] : 0; - break; - } - $res = self::GoodsDataList($p); - if(!empty($res['data']) && is_array($res['data'])) - { - foreach($res['data'] as &$g) - { - $g['goods_url'] = self::LayoutUrlValueHandle('goods', $g); - } - } - $vss['config']['data_list'] = $res['data']; - break; - - // 标题 - case 'title' : - // 关键字 - $keywords_list = []; - if(!empty($vss['config']['keywords_list'])) - { - foreach($vss['config']['keywords_list'] as $wd) - { - $keywords_list[] = [ - 'keywords' => $wd['content_keywords'], - 'color' => empty($wd['style_keywords_color']) ? '' : $wd['style_keywords_color'], - 'url' => self::LayoutUrlValueHandle($wd['content_to_type'], $wd['content_to_value']), - ]; - } - } - - // 配置重新组合 - $vss['config'] = [ - 'frontend_config' => $vss['config']['frontend_config'], - 'title' => $vss['config']['content_title'], - 'title_vice' => $vss['config']['content_title_vice'], - 'title_more' => $vss['config']['content_title_more'], - 'title_more_url' => self::LayoutUrlValueHandle($vss['config']['content_to_type'], $vss['config']['content_to_value']), - 'keywords_list' => $keywords_list, - ]; - break; - - // 自定义html - case 'custom' : - $vss['config']['custom'] = empty($vss['config']['custom']) ? '' : htmlspecialchars_decode($vss['config']['custom']); - break; - } + // 自定义html + case 'custom' : + $vss['config']['custom'] = empty($vss['config']['custom']) ? '' : htmlspecialchars_decode($vss['config']['custom']); + break; } } } } } } - - // 存储缓存 - MyCache($cache_key, $config, 180); } - } else { - $config = $data; } } return $config; } /** - * 配置信息字段处理 + * 配置信息字段保存处理 * @author Devil * @blog http://gong.gg/ * @version 1.0.0 @@ -522,37 +533,79 @@ class BaseLayout * @desc description * @param [array] $config [配置信息] */ - public static function ConfigViewFieldHandle($config) + public static function ConfigSaveFieldHandle($config) { if(!empty($config) && is_array($config)) { - // 配置信息多余字段移除 - $arr = [ - 'style_', - 'content_item_keywords_', - 'content_images_', - 'content_to_type_', - 'content_to_name_', - 'content_to_value_', - 'view_list_number_', - ]; - foreach($config as $k=>$v) + // 背景图片地址 + $fields = ['style_background_images']; + foreach($fields as $v) { - foreach($arr as $f) + if(!empty($config[$v])) { - $length = strlen($f); - if(substr($k, 0, $length) == $f) - { - unset($config[$k]); - } + $config[$v] = ResourcesService::AttachmentPathHandle($config[$v]); } } + } + return $config; + } + /** + * 配置信息字段展示处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2021-06-22 + * @desc description + * @param [array] $config [配置信息] + * @param [boolean] $is_del_surplus_field [移除多余字段] + */ + public static function ConfigViewFieldHandle($config, $is_del_surplus_field = false) + { + if(!empty($config) && is_array($config)) + { // 滚动配置 if(array_key_exists('view_list_show_style_value', $config)) { $config['view_list_show_style_value_arr'] = empty($config['view_list_show_style_value']) ? '' : json_decode(urldecode($config['view_list_show_style_value']), true); - unset($config['view_list_show_style_value']); + } + + // 附件 + $attachment_fields = ['style_background_images']; + foreach($attachment_fields as $av) + { + if(!empty($config[$av])) + { + $config[$av] = ResourcesService::AttachmentPathViewHandle($config[$av]); + } + } + + // 配置信息多余字段移除 + if($is_del_surplus_field) + { + $fields = [ + 'style_', + 'content_item_keywords_', + 'content_images_', + 'content_to_type_', + 'content_to_name_', + 'content_to_value_', + 'view_list_number_', + ]; + foreach($config as $k=>$v) + { + if(!in_array($k, $attachment_fields)) + { + foreach($fields as $f) + { + $length = strlen($f); + if(substr($k, 0, $length) == $f) + { + unset($config[$k]); + } + } + } + } } } return $config; diff --git a/app/layout/view/base.html b/app/layout/view/base.html index 39ee00799..ad1eabdf6 100644 --- a/app/layout/view/base.html +++ b/app/layout/view/base.html @@ -1,20 +1,17 @@ -
+
-
- -

1. 手机模式下每一块布局全部自动100%展示、从左往右依次往下排版

-

2. 布局宽度以100%分为12块、每一块占比（8.33%）

-

3. 小屏（640px及以下）、中屏（641px及以上）、大屏（1025px及以上）

-
- -
+
@@ -32,7 +29,7 @@
-
+
@@ -113,7 +110,7 @@
-
+
{{foreach $v.children as $ks=>$vs}} {{if count($v['value_arr']) eq 1}} {{include file="../../../layout/view/public/common/module_admin" /}} diff --git a/app/layout/view/public/common/module_admin.html b/app/layout/view/public/common/module_admin.html index c67421190..58da1729d 100644 --- a/app/layout/view/public/common/module_admin.html +++ b/app/layout/view/public/common/module_admin.html @@ -1,4 +1,4 @@ -
+
diff --git a/app/layout/view/public/common/module_view.html b/app/layout/view/public/common/module_view.html index 30821dded..9ee1ef240 100644 --- a/app/layout/view/public/common/module_view.html +++ b/app/layout/view/public/common/module_view.html @@ -1,4 +1,4 @@ -
+
{{if !empty($vs['children']) and is_array($vs['children'])}} {{foreach $vs.children as $kss=>$vss}} diff --git a/app/layout/view/public/offcanvas/offcanvas_layout_config.html b/app/layout/view/public/offcanvas/offcanvas_layout_config.html index 6a108abbe..8b7815d7d 100644 --- a/app/layout/view/public/offcanvas/offcanvas_layout_config.html +++ b/app/layout/view/public/offcanvas/offcanvas_layout_config.html @@ -7,6 +7,24 @@
基础样式
+ +
+ +
    +
    + +上传图片 + + + +
    +
    + {{include file="../../../layout/view/public/style/background_color" key="" required="" /}} @@ -15,7 +33,7 @@
    diff --git a/app/layout/view/view.html b/app/layout/view/view.html index cb5d22435..c996799c1 100644 --- a/app/layout/view/view.html +++ b/app/layout/view/view.html @@ -3,7 +3,7 @@ {{foreach $layout_data as $k=>$v}} {{if !empty($v['value']) and !empty($v['children']) and is_array($v['children']) and !empty($v['value_arr']) and count($v['children']) eq count($v['value_arr']) and $v['status'] eq 1}}
    -
    +
    {{foreach $v.children as $ks=>$vs}} {{if count($v['value_arr']) eq 1}} {{include file="../../../layout/view/public/common/module_view" /}} diff --git a/app/service/DesignService.php b/app/service/DesignService.php index eb4343fe7..088b986f7 100644 --- a/app/service/DesignService.php +++ b/app/service/DesignService.php @@ -389,12 +389,26 @@ class DesignService // 开始处理数据 foreach($config as &$v) { + // 配置处理 + if(!empty($v['config'])) + { + $v['config'] = self::ConfigAttachmentDownloadHandle($dir, $data_id, $v['config']); + } + + // 是否存在下级数据 if(empty($v['children'])) { continue; } foreach($v['children'] as &$vs) { + // 配置处理 + if(!empty($vs['config'])) + { + $vs['config'] = self::ConfigAttachmentDownloadHandle($dir, $data_id, $vs['config']); + } + + // 是否存在下级数据 if(empty($vs['children'])) { continue; @@ -405,6 +419,11 @@ class DesignService { continue; } + + // 配置处理 + $vss['config'] = self::ConfigAttachmentDownloadHandle($dir, $data_id, $vss['config']); + + // 根据模块处理 switch($vss['value']) { // 单图 @@ -457,6 +476,28 @@ class DesignService return $config; } + /** + * 配置信息附件处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2021-06-22 + * @desc description + * @param [string] $dir [存储路径] + * @param [int] $data_id [数据id] + * @param [array] $config [配置信息] + */ + public static function ConfigAttachmentDownloadHandle($dir, $data_id, $config) + { + // 背景图片 + if(!empty($config['style_background_images'])) + { + $config['style_background_images'] = self::FileSave($data_id, $config['style_background_images'], 'images', $dir); + } + + return $config; + } + /** * 文件保存 * @author Devil diff --git a/public/static/common/css/layout.admin.css b/public/static/common/css/layout.admin.css index 9e79a7638..dbb335d58 100644 --- a/public/static/common/css/layout.admin.css +++ b/public/static/common/css/layout.admin.css @@ -26,7 +26,7 @@ .renovation-tabs li:not(.am-active) a:hover { border-color: transparent !important; } -.renovation-tabs .renovation-panel .scrollspy-nav.am-sticky { +.renovation-tabs.am-sticky { background: #fff; border: 1px solid #eee; border-top: 0; @@ -252,6 +252,7 @@ -webkit-box-shadow: none; box-shadow: none; } +.module-offcanvas-container .layout-style-background-images-view li, .module-offcanvas-container .module-images-type-images-view li, .module-offcanvas-container .module-slider-type-images-view li { width: 100%; diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js index f5a1ab309..8ea7b851e 100755 --- a/public/static/common/js/common.js +++ b/public/static/common/js/common.js @@ -632,7 +632,14 @@ function FormDataFill(json, tag) // input radio $form.find('input[type="radio"][name="'+i+'"]').each(function(k, v) { - this.checked = (json[i] == $(this).val()); + this.checked = json[i] == $(this).val(); + $(this).trigger('change'); + }); + // input checkbox + $form.find('input[type="checkbox"][name="'+i+'"]').each(function(k, v) + { + var temp_value = (typeof(json[i]) != 'object') ? json[i].toString().split(',') : json[i]; + this.checked = temp_value.indexOf($(this).val()) != -1; $(this).trigger('change'); }); } diff --git a/public/static/common/js/layout.admin.js b/public/static/common/js/layout.admin.js index 5dafde709..f35c62649 100644 --- a/public/static/common/js/layout.admin.js +++ b/public/static/common/js/layout.admin.js @@ -511,8 +511,8 @@ function FormBackLayoutConfigHandle(data) ent += 'layout-'+size_arr[i]+'-border-radius-'+data[key]+' '; } } - // 系统标准限宽 - if((data['width_max_limit_value'] || null) != null) + // 系统标准限宽、兼容老版本的参数 + if((data['style_width_max_limit_value'] || null) != null || (data['width_max_limit_value'] || null) != null) { ent += 'am-container '; } @@ -531,9 +531,32 @@ function FormBackLayoutConfigHandle(data) style += 'border-color:'+data['style_border_color']+';'; } + // 背景样式 + // 是否不允许重复 + if(parseInt(data.style_background_images_no_repeat || 0) == 1) + { + style += 'background-repeat:no-repeat;'; + } + // 是否铺满 + if(parseInt(data.style_background_images_size_cover || 0) == 1) + { + style += 'background-size:cover;'; + } + // 是否居中 + if(parseInt(data.style_background_images_position_center || 0) == 1) + { + style += 'background-position:center;'; + } + // 背景图片 + var temp_style = style; + if((data.style_background_images || null) != null) + { + temp_style += 'background-image:url('+data.style_background_images+');'; + } + // 类和样式处理 $layout_content_obj.attr('class', $offcanvas_layout_config.attr('data-ent')+' '+ent); - $layout_content_obj.attr('style', style); + $layout_content_obj.attr('style', temp_style); // 数据加入配置 data['frontend_config'] = { @@ -2212,6 +2235,40 @@ function FormBackModulePopupGoodsSearchHandle(data) $popup_goods_search.modal('close'); } +/** + * 模块-基础布局处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2021-05-18 + * @desc description + * @param {[object]} data [表单数据] + */ +function ModuleConfigBaseContentHandle(data) +{ + // 默认值处理 + data.style_width_max_limit_value = data.style_width_max_limit_value || ''; + data.style_background_images_no_repeat = data.style_background_images_no_repeat || ''; + data.style_background_images_size_cover = data.style_background_images_size_cover || ''; + data.style_background_images_position_center = data.style_background_images_position_center || ''; + + // 图片处理 + var $ul = $offcanvas_layout_config.find('ul.layout-style-background-images-view'); + if((data.style_background_images || null) == null) + { + $ul.find('li').remove(); + } else { + var html = `
  • + + + × +
    • `; + $ul.html(html); + } + + return data; +} + /** * 模块-图片链接地址生成 * @author Devil @@ -3029,8 +3086,15 @@ $(function() json[i] = ''; } } + // 节点数据处理 + json = ModuleConfigBaseContentHandle(json); + + // 表单赋值 FormDataFill(json, config_doc); + // 单选框初始化 + $offcanvas_layout_config.find('input[type="checkbox"], input[type="radio"]').uCheck(); + // 背景色组件处理 ModuleColorpickerHandle($offcanvas_layout_config); @@ -3085,7 +3149,13 @@ $(function() json[i] = ''; } } + // 节点数据处理 + json = ModuleConfigBaseContentHandle(json); + + // 表单赋值 FormDataFill(json, config_doc); + // 单选框初始化 + $offcanvas_layout_config.find('input[type="checkbox"], input[type="radio"]').uCheck(); // 背景色组件处理 ModuleColorpickerHandle($offcanvas_layout_config); diff --git a/public/static/common/lib/colorpicker/jquery.colorpicker.js b/public/static/common/lib/colorpicker/jquery.colorpicker.js index da7391ca9..809a1a395 100755 --- a/public/static/common/lib/colorpicker/jquery.colorpicker.js +++ b/public/static/common/lib/colorpicker/jquery.colorpicker.js @@ -110,8 +110,8 @@ colorTable='' +'
    ' +'' - +'' - +'
    '+lang_data.confirm+' | '+lang_data.close+' | '+lang_data.clear+'
    ' + +'' + +''+lang_data.confirm+' | '+lang_data.close+' | '+lang_data.clear+'' +'' +colorTable+'
    '; $('#colorpanel'+index).html(colorTable);