From 11f46f0e9c85826f3a43bf2310a21bff5150ae9e Mon Sep 17 00:00:00 2001
From: Guo XIn <371864209@qq.com>
Date: Mon, 28 Aug 2023 10:29:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=BC=96=E8=BE=91=E8=A1=A8=E5=8D=95=E5=92=8C?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E8=A1=A8=E5=8D=95=E5=9C=A8?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93=E5=85=B6=E4=BB=96=E6=A0=87=E7=AD=BE=E6=97=B6?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=94=99=E4=B9=B1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/business/metadata/metadataEdit.html  |  8 ++---
 .../js/common/layui/extend/datalabel.js       |  4 +--
 .../view/sys/file/dirUploadLayer.html         | 35 ++++++++++---------
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/shandan-bianmu/src/main/resources/view/business/metadata/metadataEdit.html b/shandan-bianmu/src/main/resources/view/business/metadata/metadataEdit.html
index af683cc..8d13fd3 100644
--- a/shandan-bianmu/src/main/resources/view/business/metadata/metadataEdit.html
+++ b/shandan-bianmu/src/main/resources/view/business/metadata/metadataEdit.html
@@ -69,10 +69,10 @@
                              th:data-label-title-path="${labelSet.labelTitlePath}"></div>
                     </div>
                     <div class="layui-form-item other-label-item">
-                        <label class="layui-form-label"><a class="label-type choose-data add-other"
-                                                           id="addOtherLabelBtn">添加</a>其他标签</label>
-                        <div class="layui-input-block label-set-component other-label"
-                             th:data-field-title="其他标签"></div>
+                        <label class="layui-form-label"><a class="label-type choose-data add-other" id="addOtherLabelBtn">添加</a>其他标签</label>
+                        <div class="layui-input-block other-label-item">
+                            <div class="label-set-component other-label" th:data-field-title="其他标签"></div>
+                        </div>
                     </div>
                     <!-- 隐藏域 -->
                     <input type="text" name="id" hidden="hidden"/>
diff --git a/shandan-common/src/main/resources/static/js/common/layui/extend/datalabel.js b/shandan-common/src/main/resources/static/js/common/layui/extend/datalabel.js
index 05b90fb..3ce5943 100644
--- a/shandan-common/src/main/resources/static/js/common/layui/extend/datalabel.js
+++ b/shandan-common/src/main/resources/static/js/common/layui/extend/datalabel.js
@@ -250,8 +250,8 @@ layui.define(['globalTree'], function (exports) {
     }
 
     function addOtherLabel(value, readonly) {
-        let template = `<div class="layui-input-block label-set-component other-label ${readonly?'read-only':''}" th:data-field-title="其他标签"></div>`;
-        $('.other-label-item').append(template);
+        let template = `<div class="label-set-component other-label ${readonly?'read-only':''}" th:data-field-title="其他标签"></div>`;
+        $('.other-label-item.layui-input-block').append(template);
         let cid = _KEY + _CACHE.size,
             component = new Component(cid, $('.label-set-component.other-label:last'));
 
diff --git a/shandan-system/src/main/resources/view/sys/file/dirUploadLayer.html b/shandan-system/src/main/resources/view/sys/file/dirUploadLayer.html
index 085b366..b871de0 100644
--- a/shandan-system/src/main/resources/view/sys/file/dirUploadLayer.html
+++ b/shandan-system/src/main/resources/view/sys/file/dirUploadLayer.html
@@ -38,12 +38,13 @@
             <div class="layui-upload" id="uploader-table"></div>
         </div>
         <div class="layui-form dynamic-form" lay-filter="file-form"
-             style="border: 1px solid #eee; padding-top:15px; margin-bottom: 50px;" th:object="${@securityUtil.getLoginSysUser()}">
+             style="border: 1px solid #eee; padding-top:15px; margin-bottom: 50px;"
+             th:object="${@securityUtil.getLoginSysUser()}">
             <div class="layui-form-item"
                  th:each="field,iterStat : ${uploadFormConfig}"
                  th:if="${field.isShow}"
                  th:style="${field.fieldType == 'textarea' ? 'width: calc(100% - 30px);' : ''}"
-                th:with="username=*{userName}">
+                 th:with="username=*{userName}">
                 <label th:if="${field.isRequired}" class="layui-form-label">
                     <label style="color: red">*</label>
                     <label th:text="${field.showTitle}">*</label>
@@ -84,22 +85,24 @@
                          th:id="${'dict-'+field.fieldName}"></div>
                 </div>
             </div>
-            <div class="layui-form-item" th:each="labelSet, iterState:${LabelConfigSet}" style="width: 100%">
+            <div class="layui-form-item" style="width: 100%" th:each="labelSet, iterState:${LabelConfigSet}">
                 <label class="layui-form-label" th:text="${labelSet.fieldTitle}">标签类型</label>
-                <div class="layui-input-block label-set-component"
-                     th:data-id="${labelSet.id}"
-                     th:data-field-title="${labelSet.fieldTitle}"
-                     th:data-label-id="${labelSet.labelId}"
-                     th:data-label-title="${labelSet.labelTitle}"
-                     th:data-label-id-path="${labelSet.labelIdPath}"
-                     th:data-label-title-path="${labelSet.labelTitlePath}"
-                     style="width:calc(100% - 120px);margin-left: 0"></div>
+                <div class="layui-input-block">
+                    <div class="label-set-component"
+                         th:data-id="${labelSet.id}"
+                         th:data-field-title="${labelSet.fieldTitle}"
+                         th:data-label-id="${labelSet.labelId}"
+                         th:data-label-title="${labelSet.labelTitle}"
+                         th:data-label-id-path="${labelSet.labelIdPath}"
+                         th:data-label-title-path="${labelSet.labelTitlePath}"
+                         style="width:calc(100% - 120px);margin-left: 0"></div>
+                </div>
             </div>
-            <div class="layui-form-item other-label-item">
-                <label class="layui-form-label"><a class="label-type choose-data add-other"
-                                                   id="addOtherLabelBtn">添加</a>其他标签</label>
-                <div class="layui-input-block label-set-component other-label" th:data-field-title="其他标签"
-                     style="width:calc(100% - 120px);margin-left: 0"></div>
+            <div class="layui-form-item other-label-item" style="width: 100%">
+                <label class="layui-form-label"><a class="label-type choose-data add-other" id="addOtherLabelBtn">添加</a>其他标签</label>
+                <div class="layui-input-block other-label-item">
+                    <div class="label-set-component other-label" th:data-field-title="其他标签"></div>
+                </div>
             </div>
         </div>
         <div class="bottom-btns">