From 7c7fe5380a707327b2939be95a4220b7cc172e9f Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: Wed, 17 Nov 2021 20:41:08 +0800
Subject: [PATCH] =?UTF-8?q?fix(admin(general)):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BA=86=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE=E4=B8=AD=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E5=90=8D=E5=AD=98=E5=9C=A8=E7=82=B9=E5=8F=B7=EF=BC=88?=
 =?UTF-8?q?"."=EF=BC=89=E6=97=B6=E9=83=A8=E5=88=86=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

根据HTML5 id命名规则：必须以字母 A-Z 或 a-z
开头；其后的字符：字母(A-Za-z)、数字(0-9)、连字符("-")、下划线("_")、冒号(":")
以及点号(".")；值对大小写敏感。
id应当适配变量名存在点号的情况，但变量名中$site.之后存在点号时（例如：$site.product.image）会导致一些组件无法正常工作（如：图片上传、文件上传）。
原因是layui在获取dom的过程中使用了选择器，而非document.getElementById。但是选择器会将点号识别为css中的class进而导致无法正常获取。
---
 .../admin/controller/general/Config.php       |  4 +++
 .../admin/view/general/config/index.html      | 36 +++++++++----------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/application/admin/controller/general/Config.php b/application/admin/controller/general/Config.php
index bab69e841..ed3a9388d 100644
--- a/application/admin/controller/general/Config.php
+++ b/application/admin/controller/general/Config.php
@@ -73,6 +73,10 @@ class Config extends Backend
         }
         $index = 0;
         foreach ($siteList as $k => &$v) {
+            foreach ($v['list'] as &$item) {
+                $item['tag_id'] = str_replace('.', '__', $item['name']);
+            }
+
             $v['active'] = !$index ? true : false;
             $index++;
         }
diff --git a/application/admin/view/general/config/index.html b/application/admin/view/general/config/index.html
index b0faf30f0..0aa21b4a4 100644
--- a/application/admin/view/general/config/index.html
+++ b/application/admin/view/general/config/index.html
@@ -78,7 +78,7 @@
                                             <textarea {$item.extend_html} name="row[{$item.name}]" class="form-control" data-rule="{$item.rule}" rows="5" data-tip="{$item.tip}">{$item.value|htmlentities}</textarea>
                                             {/case}
                                             {case editor}
-                                            <textarea {$item.extend_html} name="row[{$item.name}]" id="editor-{$item.name}" class="form-control editor" data-rule="{$item.rule}" rows="5" data-tip="{$item.tip}">{$item.value|htmlentities}</textarea>
+                                            <textarea {$item.extend_html} name="row[{$item.name}]" id="editor-{$item.tag_id}" class="form-control editor" data-rule="{$item.rule}" rows="5" data-tip="{$item.tip}">{$item.value|htmlentities}</textarea>
                                             {/case}
                                             {case array}
                                             <dl {$item.extend_html} class="fieldlist" data-name="row[{$item.name}]">
@@ -108,14 +108,14 @@
                                             {case checkbox}
                                             <div class="checkbox">
                                             {foreach name="item.content" item="vo"}
-                                            <label for="row[{$item.name}][]-{$key}"><input id="row[{$item.name}][]-{$key}" name="row[{$item.name}][]" type="checkbox" value="{$key}" data-tip="{$item.tip}" {in name="key" value="$item.value" }checked{/in} /> {$vo}</label>
+                                            <label for="row[{$item.tag_id}][]-{$key}"><input id="row[{$item.tag_id}][]-{$key}" name="row[{$item.name}][]" type="checkbox" value="{$key}" data-tip="{$item.tip}" {in name="key" value="$item.value" }checked{/in} /> {$vo}</label>
                                             {/foreach}
                                             </div>
                                             {/case}
                                             {case radio}
                                             <div class="radio">
                                             {foreach name="item.content" item="vo"}
-                                            <label for="row[{$item.name}]-{$key}"><input id="row[{$item.name}]-{$key}" name="row[{$item.name}]" type="radio" value="{$key}" data-tip="{$item.tip}" {in name="key" value="$item.value" }checked{/in} /> {$vo}</label>
+                                            <label for="row[{$item.tag_id}]-{$key}"><input id="row[{$item.tag_id}]-{$key}" name="row[{$item.name}]" type="radio" value="{$key}" data-tip="{$item.tip}" {in name="key" value="$item.value" }checked{/in} /> {$vo}</label>
                                             {/foreach}
                                             </div>
                                             {/case}
@@ -130,40 +130,40 @@
                                             {case value="image" break="0"}{/case}
                                             {case value="images"}
                                             <div class="form-inline">
-                                                <input id="c-{$item.name}" class="form-control" size="50" name="row[{$item.name}]" type="text" value="{$item.value|htmlentities}" data-tip="{$item.tip}">
-                                                <span><button type="button" id="faupload-{$item.name}" class="btn btn-danger faupload" data-input-id="c-{$item.name}" data-mimetype="image/*" data-multiple="{$item.type=='image'?'false':'true'}" data-preview-id="p-{$item.name}"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                                                <span><button type="button" id="fachoose-{$item.name}" class="btn btn-primary fachoose" data-input-id="c-{$item.name}" data-mimetype="image/*" data-multiple="{$item.type=='image'?'false':'true'}"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
-                                                <span class="msg-box n-right" for="c-{$item.name}"></span>
-                                                <ul class="row list-inline faupload-preview" id="p-{$item.name}"></ul>
+                                                <input id="c-{$item.tag_id}" class="form-control" size="50" name="row[{$item.name}]" type="text" value="{$item.value|htmlentities}" data-tip="{$item.tip}">
+                                                <span><button type="button" id="faupload-{$item.tag_id}" class="btn btn-danger faupload" data-input-id="c-{$item.tag_id}" data-mimetype="image/*" data-multiple="{$item.type=='image'?'false':'true'}" data-preview-id="p-{$item.tag_id}"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                                                <span><button type="button" id="fachoose-{$item.tag_id}" class="btn btn-primary fachoose" data-input-id="c-{$item.tag_id}" data-mimetype="image/*" data-multiple="{$item.type=='image'?'false':'true'}"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                                                <span class="msg-box n-right" for="c-{$item.tag_id}"></span>
+                                                <ul class="row list-inline faupload-preview" id="p-{$item.tag_id}"></ul>
                                             </div>
                                             {/case}
                                             {case value="file" break="0"}{/case}
                                             {case value="files"}
                                             <div class="form-inline">
-                                                <input id="c-{$item.name}" class="form-control" size="50" name="row[{$item.name}]" type="text" value="{$item.value|htmlentities}" data-tip="{$item.tip}">
-                                                <span><button type="button" id="faupload-{$item.name}" class="btn btn-danger faupload" data-input-id="c-{$item.name}" data-multiple="{$item.type=='file'?'false':'true'}"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                                                <span><button type="button" id="fachoose-{$item.name}" class="btn btn-primary fachoose" data-input-id="c-{$item.name}" data-multiple="{$item.type=='file'?'false':'true'}"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
-                                                <span class="msg-box n-right" for="c-{$item.name}"></span>
+                                                <input id="c-{$item.tag_id}" class="form-control" size="50" name="row[{$item.name}]" type="text" value="{$item.value|htmlentities}" data-tip="{$item.tip}">
+                                                <span><button type="button" id="faupload-{$item.tag_id}" class="btn btn-danger faupload" data-input-id="c-{$item.tag_id}" data-multiple="{$item.type=='file'?'false':'true'}"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                                                <span><button type="button" id="fachoose-{$item.tag_id}" class="btn btn-primary fachoose" data-input-id="c-{$item.tag_id}" data-multiple="{$item.type=='file'?'false':'true'}"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                                                <span class="msg-box n-right" for="c-{$item.tag_id}"></span>
                                             </div>
                                             {/case}
                                             {case switch}
-                                            <input id="c-{$item.name}" name="row[{$item.name}]" type="hidden" value="{:$item.value?1:0}">
-                                            <a href="javascript:;" data-toggle="switcher" class="btn-switcher" data-input-id="c-{$item.name}" data-yes="1" data-no="0">
+                                            <input id="c-{$item.tag_id}" name="row[{$item.name}]" type="hidden" value="{:$item.value?1:0}">
+                                            <a href="javascript:;" data-toggle="switcher" class="btn-switcher" data-input-id="c-{$item.tag_id}" data-yes="1" data-no="0">
                                                 <i class="fa fa-toggle-on text-success {if !$item.value}fa-flip-horizontal text-gray{/if} fa-2x"></i>
                                             </a>
                                             {/case}
                                             {case bool}
-                                            <label for="row[{$item.name}]-yes"><input id="row[{$item.name}]-yes" name="row[{$item.name}]" type="radio" value="1" {$item.value?'checked':''} data-tip="{$item.tip}" /> {:__('Yes')}</label>
-                                            <label for="row[{$item.name}]-no"><input id="row[{$item.name}]-no" name="row[{$item.name}]" type="radio" value="0" {$item.value?'':'checked'} data-tip="{$item.tip}" /> {:__('No')}</label>
+                                            <label for="row[{$item.tag_id}]-yes"><input id="row[{$item.tag_id}]-yes" name="row[{$item.name}]" type="radio" value="1" {$item.value?'checked':''} data-tip="{$item.tip}" /> {:__('Yes')}</label>
+                                            <label for="row[{$item.tag_id}]-no"><input id="row[{$item.tag_id}]-no" name="row[{$item.name}]" type="radio" value="0" {$item.value?'':'checked'} data-tip="{$item.tip}" /> {:__('No')}</label>
                                             {/case}
                                             {case city}
                                             <div style="position:relative">
-                                            <input {$item.extend_html} type="text" name="row[{$item.name}]" id="c-{$item.name}" value="{$item.value|htmlentities}" class="form-control" data-toggle="city-picker" data-tip="{$item.tip}" data-rule="{$item.rule}" />
+                                            <input {$item.extend_html} type="text" name="row[{$item.name}]" id="c-{$item.tag_id}" value="{$item.value|htmlentities}" class="form-control" data-toggle="city-picker" data-tip="{$item.tip}" data-rule="{$item.rule}" />
                                             </div>
                                             {/case}
                                             {case value="selectpage" break="0"}{/case}
                                             {case value="selectpages"}
-                                            <input {$item.extend_html} type="text" name="row[{$item.name}]" id="c-{$item.name}" value="{$item.value|htmlentities}" class="form-control selectpage" data-source="{:url('general.config/selectpage')}?id={$item.id}" data-primary-key="{$item.setting.primarykey}" data-field="{$item.setting.field}" data-multiple="{$item.type=='selectpage'?'false':'true'}" data-tip="{$item.tip}" data-rule="{$item.rule}" />
+                                            <input {$item.extend_html} type="text" name="row[{$item.name}]" id="c-{$item.tag_id}" value="{$item.value|htmlentities}" class="form-control selectpage" data-source="{:url('general.config/selectpage')}?id={$item.id}" data-primary-key="{$item.setting.primarykey}" data-field="{$item.setting.field}" data-multiple="{$item.type=='selectpage'?'false':'true'}" data-tip="{$item.tip}" data-rule="{$item.rule}" />
                                             {/case}
                                             {case custom}
                                             {$item.extend_html}
-- 
Gitee