From fe9218de8051debbd6345787bfc189c848219261 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Fri, 6 May 2022 23:46:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=A1=A8=E6=A0=BC=E6=8E=92?=
 =?UTF-8?q?=E9=99=A4=E9=80=89=E6=8B=A9=E6=8E=A7=E4=BB=B6=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/form/Goods.php                      |  6 ++---
 .../default/lib/module/category_brand.html    |  8 -------
 .../default/public/module/form_table.html     | 22 +++++++++++++++++--
 app/admin/view/default/site/base/index.html   |  6 ++---
 .../default/public/module/form_table.html     | 22 +++++++++++++++++--
 app/module/FormHandleModule.php               |  8 +++++--
 app/service/GoodsService.php                  |  2 +-
 public/static/admin/default/js/common.js      |  7 +++---
 8 files changed, 57 insertions(+), 24 deletions(-)
 delete mode 100644 app/admin/view/default/lib/module/category_brand.html

diff --git a/app/admin/form/Goods.php b/app/admin/form/Goods.php
index cf756fa7d..836953598 100644
--- a/app/admin/form/Goods.php
+++ b/app/admin/form/Goods.php
@@ -108,13 +108,13 @@ class Goods
                     'view_key'      => 'brand_name',
                     'is_sort'       => 1,
                     'search_config' => [
-                        'form_type'         => 'module',
-                        'template'          => 'lib/module/category_brand',
+                        'form_type'         => 'select',
                         'form_name'         => 'brand_id',
+                        'where_type'        => 'in',
                         'data'              => BrandService::CategoryBrand(),
                         'data_key'          => 'id',
                         'data_name'         => 'name',
-                        'where_type'        => 'in',
+                        'is_multiple'       => 1,
                     ],
                 ],
                 [
diff --git a/app/admin/view/default/lib/module/category_brand.html b/app/admin/view/default/lib/module/category_brand.html
deleted file mode 100644
index d438dc6e8..000000000
--- a/app/admin/view/default/lib/module/category_brand.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- 分类下品牌 -->
-{{if !empty($module_data['data']) && !empty($module_data['form_name_key'])}}
-    <select class="am-radius chosen-select" multiple name="{{$module_data.form_name_key}}" data-placeholder="品牌...">
-        {{foreach $module_data.data as $v}}
-            <option value="{{$v.id}}" {{if !empty($module_data['params']) and !empty($module_data['params'][$module_data['form_name_key']]) and is_array($module_data['params'][$module_data['form_name_key']]) and in_array($v['id'], $module_data['params'][$module_data['form_name_key']])}}selected{{/if}}>{{$v.name}}</option>
-        {{/foreach}}
-    </select>
-{{/if}}
\ No newline at end of file
diff --git a/app/admin/view/default/public/module/form_table.html b/app/admin/view/default/public/module/form_table.html
index 8b98938b6..598c19e74 100644
--- a/app/admin/view/default/public/module/form_table.html
+++ b/app/admin/view/default/public/module/form_table.html
@@ -279,7 +279,16 @@
                                             {{case radio}}
                                                 {{if isset($data_list[$i][$form_table['base']['key_field']])}}
                                                     <!-- 是否配置指定数据不显示控件 -->
-                                                    {{if empty($t['not_show_data']) or empty($t['not_show_key']) or !isset($data_list[$i][$t['not_show_key']]) or !in_array($data_list[$i][$t['not_show_key']], $t['not_show_data'])}}
+                                                    {{if
+                                                        !isset($t['not_show_data']) or 
+                                                        empty($t['not_show_key']) or 
+                                                        (is_array($t['not_show_data']) and isset($data_list[$i][$t['not_show_key']]) and !in_array($data_list[$i][$t['not_show_key']], $t['not_show_data'])) or 
+                                                        (isset($t['not_show_type']) and isset($data_list[$i][$t['not_show_key']]) and (
+                                                            ($t['not_show_type'] eq 0 and $data_list[$i][$t['not_show_key']] eq $t['not_show_data']) or 
+                                                            ($t['not_show_type'] eq 1 and $data_list[$i][$t['not_show_key']] gt $t['not_show_data']) or 
+                                                            ($t['not_show_type'] eq 2 and $data_list[$i][$t['not_show_key']] lt $t['not_show_data'])
+                                                        ))
+                                                    }}
                                                         <div class="form-table-operate-radio">
                                                             <label class="am-radio am-secondary am-radio-inline">
                                                                 <input type="radio" name="{{$t.view_key}}" value="{{$data_list[$i][$form_table['base']['key_field']]}}" {{if isset($t['is_checked']) and $t['is_checked'] eq 1}}checked{{/if}} data-am-ucheck />
@@ -291,7 +300,16 @@
                                             {{case checkbox}}
                                                 {{if isset($data_list[$i][$form_table['base']['key_field']])}}
                                                     <!-- 是否配置指定数据不显示控件 -->
-                                                    {{if empty($t['not_show_data']) or empty($t['not_show_key']) or !isset($data_list[$i][$t['not_show_key']]) or !in_array($data_list[$i][$t['not_show_key']], $t['not_show_data'])}}
+                                                    {{if
+                                                        !isset($t['not_show_data']) or 
+                                                        empty($t['not_show_key']) or 
+                                                        (is_array($t['not_show_data']) and isset($data_list[$i][$t['not_show_key']]) and !in_array($data_list[$i][$t['not_show_key']], $t['not_show_data'])) or 
+                                                        (isset($t['not_show_type']) and isset($data_list[$i][$t['not_show_key']]) and !is_array($t['not_show_data']) and (
+                                                            ($t['not_show_type'] eq 0 and $data_list[$i][$t['not_show_key']] eq $t['not_show_data']) or 
+                                                            ($t['not_show_type'] eq 1 and $data_list[$i][$t['not_show_key']] gt $t['not_show_data']) or 
+                                                            ($t['not_show_type'] eq 2 and $data_list[$i][$t['not_show_key']] lt $t['not_show_data'])
+                                                        ))
+                                                    }}
                                                         <div class="form-table-operate-checkbox">
                                                             <label class="am-checkbox am-secondary am-checkbox-inline">
                                                                 <input type="checkbox" name="{{$t.view_key}}" value="{{$data_list[$i][$form_table['base']['key_field']]}}" {{if isset($t['is_checked']) and $t['is_checked'] eq 1}}checked{{/if}} data-am-ucheck />
diff --git a/app/admin/view/default/site/base/index.html b/app/admin/view/default/site/base/index.html
index af1497bbb..cfd76ece4 100755
--- a/app/admin/view/default/site/base/index.html
+++ b/app/admin/view/default/site/base/index.html
@@ -123,15 +123,15 @@
                     </div>
                     <div class="am-form-group">
                         <label>{{$data.common_domain_host.name}}<span class="am-form-group-label-tips">{{$data.common_domain_host.describe}}</span></label>
-                        <input type="text" name="{{$data.common_domain_host.only_tag}}" placeholder="{{$data.common_domain_host.describe}}" data-validation-message="{{$data.common_domain_host.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_domain_host.value}}"{{/if}} />
+                        <input type="url" name="{{$data.common_domain_host.only_tag}}" placeholder="{{$data.common_domain_host.describe}}" data-validation-message="{{$data.common_domain_host.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_domain_host.value}}"{{/if}} />
                     </div>
                     <div class="am-form-group">
                         <label>{{$data.common_cdn_attachment_host.name}}<span class="am-form-group-label-tips">{{$data.common_cdn_attachment_host.describe}}</span></label>
-                        <input type="text" name="{{$data.common_cdn_attachment_host.only_tag}}" placeholder="{{$data.common_cdn_attachment_host.describe}}" data-validation-message="{{$data.common_cdn_attachment_host.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_cdn_attachment_host.value}}"{{/if}} />
+                        <input type="url" name="{{$data.common_cdn_attachment_host.only_tag}}" placeholder="{{$data.common_cdn_attachment_host.describe}}" data-validation-message="{{$data.common_cdn_attachment_host.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_cdn_attachment_host.value}}"{{/if}} />
                     </div>
                     <div class="am-form-group">
                         <label>{{$data.common_cdn_public_host.name}}<span class="am-form-group-label-tips">{{$data.common_cdn_public_host.describe}}</span></label>
-                        <input type="text" name="{{$data.common_cdn_public_host.only_tag}}" placeholder="{{$data.common_cdn_public_host.describe}}" data-validation-message="{{$data.common_cdn_public_host.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_cdn_public_host.value}}"{{/if}} />
+                        <input type="url" name="{{$data.common_cdn_public_host.only_tag}}" placeholder="{{$data.common_cdn_public_host.describe}}" data-validation-message="{{$data.common_cdn_public_host.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_cdn_public_host.value}}"{{/if}} />
                     </div>
                 </div>
             </div>
diff --git a/app/index/view/default/public/module/form_table.html b/app/index/view/default/public/module/form_table.html
index 8b98938b6..009be73d8 100644
--- a/app/index/view/default/public/module/form_table.html
+++ b/app/index/view/default/public/module/form_table.html
@@ -279,7 +279,16 @@
                                             {{case radio}}
                                                 {{if isset($data_list[$i][$form_table['base']['key_field']])}}
                                                     <!-- 是否配置指定数据不显示控件 -->
-                                                    {{if empty($t['not_show_data']) or empty($t['not_show_key']) or !isset($data_list[$i][$t['not_show_key']]) or !in_array($data_list[$i][$t['not_show_key']], $t['not_show_data'])}}
+                                                    {{if
+                                                        !isset($t['not_show_data']) or 
+                                                        empty($t['not_show_key']) or 
+                                                        (is_array($t['not_show_data']) and isset($data_list[$i][$t['not_show_key']]) and !in_array($data_list[$i][$t['not_show_key']], $t['not_show_data'])) or 
+                                                        (isset($t['not_show_type']) and isset($data_list[$i][$t['not_show_key']]) and (
+                                                            ($t['not_show_type'] eq 0 and $data_list[$i][$t['not_show_key']] eq $t['not_show_data']) or 
+                                                            ($t['not_show_type'] eq 1 and $data_list[$i][$t['not_show_key']] gt $t['not_show_data']) or 
+                                                            ($t['not_show_type'] eq 2 and $data_list[$i][$t['not_show_key']] lt $t['not_show_data'])
+                                                        ))
+                                                    }}
                                                         <div class="form-table-operate-radio">
                                                             <label class="am-radio am-secondary am-radio-inline">
                                                                 <input type="radio" name="{{$t.view_key}}" value="{{$data_list[$i][$form_table['base']['key_field']]}}" {{if isset($t['is_checked']) and $t['is_checked'] eq 1}}checked{{/if}} data-am-ucheck />
@@ -291,7 +300,16 @@
                                             {{case checkbox}}
                                                 {{if isset($data_list[$i][$form_table['base']['key_field']])}}
                                                     <!-- 是否配置指定数据不显示控件 -->
-                                                    {{if empty($t['not_show_data']) or empty($t['not_show_key']) or !isset($data_list[$i][$t['not_show_key']]) or !in_array($data_list[$i][$t['not_show_key']], $t['not_show_data'])}}
+                                                    {{if
+                                                        !isset($t['not_show_data']) or 
+                                                        empty($t['not_show_key']) or 
+                                                        (is_array($t['not_show_data']) and isset($data_list[$i][$t['not_show_key']]) and !in_array($data_list[$i][$t['not_show_key']], $t['not_show_data'])) or 
+                                                        (isset($t['not_show_type']) and isset($data_list[$i][$t['not_show_key']]) and (
+                                                            ($t['not_show_type'] eq 0 and $data_list[$i][$t['not_show_key']] eq $t['not_show_data']) or 
+                                                            ($t['not_show_type'] eq 1 and $data_list[$i][$t['not_show_key']] gt $t['not_show_data']) or 
+                                                            ($t['not_show_type'] eq 2 and $data_list[$i][$t['not_show_key']] lt $t['not_show_data'])
+                                                        ))
+                                                    }}
                                                         <div class="form-table-operate-checkbox">
                                                             <label class="am-checkbox am-secondary am-checkbox-inline">
                                                                 <input type="checkbox" name="{{$t.view_key}}" value="{{$data_list[$i][$form_table['base']['key_field']]}}" {{if isset($t['is_checked']) and $t['is_checked'] eq 1}}checked{{/if}} data-am-ucheck />
diff --git a/app/module/FormHandleModule.php b/app/module/FormHandleModule.php
index 2f0bca5ce..d0a45a6fe 100644
--- a/app/module/FormHandleModule.php
+++ b/app/module/FormHandleModule.php
@@ -368,10 +368,14 @@ class FormHandleModule
                         if(in_array($v['view_type'], ['checkbox', 'radio']))
                         {
                             // 是否部分不显示控件
-                            // 数据处理成为数组
+                            // 可配置 not_show_type 字段指定类型（0 eq 等于、 1 gt 大于、 2 lt 小于）
                             if(isset($v['not_show_data']) && !is_array($v['not_show_data']))
                             {
-                                $v['not_show_data'] = explode(',', $v['not_show_data']);
+                                // 存在英文逗号则转数组
+                                if(stripos($v['not_show_data'], ',') !== false)
+                                {
+                                    $v['not_show_data'] = explode(',', $v['not_show_data']);
+                                }
                             }
                             // 数据 key 字段默认主键 id [base->key_field]
                             if(!empty($v['not_show_data']) && empty($v['not_show_key']))
diff --git a/app/service/GoodsService.php b/app/service/GoodsService.php
index 250dacba7..59d929dd7 100755
--- a/app/service/GoodsService.php
+++ b/app/service/GoodsService.php
@@ -721,7 +721,7 @@ class GoodsService
                 }
                 if(!empty($v['upd_time']))
                 {
-                    $v['upd_time'] = date('Y-m-d H:i:s', $v['upd_time']);
+                    $v['upd_time'] = empty($v['upd_time']) ? '' : date('Y-m-d H:i:s', $v['upd_time']);
                 }
 
                 // 是否需要分类名称
diff --git a/public/static/admin/default/js/common.js b/public/static/admin/default/js/common.js
index 484702a66..22be6d2a9 100644
--- a/public/static/admin/default/js/common.js
+++ b/public/static/admin/default/js/common.js
@@ -30,9 +30,10 @@ function ParametersItemHtmlCreated(type, name, value)
         html += '<input type="text" name="parameters_value[]" placeholder="参数值" value="'+(value || '')+'" maxlength="200" data-validation-message="请填写参数值" />';
         html += '</td>';
         html += '<td class="am-text-middle">';
-        html += '<span class="am-text-xs cr-blue c-p am-margin-right-sm line-move" data-type="top">上移</span>';
-        html += '<span class="am-text-xs cr-blue c-p am-margin-right-sm line-move" data-type="bottom">下移</span>';
-        html += '<span class="am-text-xs cr-red c-p line-remove">移除</span></td>';
+        html += '<a href="javascript:;" class="am-text-xs am-text-secondary am-margin-right-sm line-move" data-type="top">上移</a> ';
+        html += '<a href="javascript:;" class="am-text-xs am-text-secondary am-margin-right-sm line-move" data-type="bottom">下移</a> ';
+        html += '<a href="javascript:;" class="am-text-xs am-text-danger line-remove">移除</a>';
+        html += '</td>';
         html += '</tr>';
 
     // 数据添加