From c4b238863849fa4a9d068eafdbcea87076c85699 Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Wed, 19 Apr 2023 17:28:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=96=B0=E5=A2=9E=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/template/js/dsFormPage/editPageContent.js   | 8 ++++++++
 .../lib/layui/customer/tableUtil/initTableChooseUtil.js   | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/common/src/main/resources/template/js/dsFormPage/editPageContent.js b/common/src/main/resources/template/js/dsFormPage/editPageContent.js
index f5ef53e7f..2c7608a7e 100644
--- a/common/src/main/resources/template/js/dsFormPage/editPageContent.js
+++ b/common/src/main/resources/template/js/dsFormPage/editPageContent.js
@@ -37,6 +37,12 @@ layui.config({
                                 <input type="text" id="placeholder" name="placeholder" placeholder="请输入控件提示语" class="layui-input" />
                             </div>
                         </div>`,
+        'remarkBox': `<div class="layui-form-item layui-col-xs12">
+                            <label class="layui-form-label">备注：</label>
+                            <div class="layui-input-block winui-radio">
+                                <input type="text" id="remark" name="remark" placeholder="请输入备注" class="layui-input" />
+                            </div>
+                        </div>`,
         'requireBox': `<div class="layui-form-item layui-col-xs12">
                             <label class="layui-form-label">限制条件</label>
                             <div class="layui-input-block" id="require">
@@ -191,6 +197,7 @@ layui.config({
 
     $("#title").val(data.title);
     $("#placeholder").val(data.placeholder);
+    $("#remark").val(data.remark);
     $("#defaultValue").val(data.defaultValue);
     $("#uploadNum").val(data.uploadNum);
 
@@ -306,6 +313,7 @@ layui.config({
         var newParams = parent.contentList[inDataIndex];
         newParams.title = $("#title").val();
         newParams.placeholder = $("#placeholder").val();
+        newParams.remark = $("#remark").val();
         newParams.require = isNull($('#require').attr('value')) ? [] : JSON.parse($('#require').attr('value'));
         newParams.uploadDataType = isNull($('#uploadDataType').attr('value')) ? [] : JSON.parse($('#uploadDataType').attr('value'));
         newParams.uploadNum = $("#uploadNum").val();
diff --git a/web/src/main/resources/template/assets/lib/layui/customer/tableUtil/initTableChooseUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/tableUtil/initTableChooseUtil.js
index 0084981e7..46bc27b4b 100644
--- a/web/src/main/resources/template/assets/lib/layui/customer/tableUtil/initTableChooseUtil.js
+++ b/web/src/main/resources/template/assets/lib/layui/customer/tableUtil/initTableChooseUtil.js
@@ -7,6 +7,7 @@ var initTableChooseUtil = {
     options: {
         id: "", // 表格加载的位置
         indexRow: 0, // 表格行计数器
+        placeholder: '', // 描述
         cols: [], // 列属性，{id: 'materialId',
                             // title: '商品',
                             // formType: 'input', formType展示方式 select：下拉框 input：普通输入框 chooseInput：选择输入框 detail：展示,只加载<td></td>
@@ -52,6 +53,7 @@ var initTableChooseUtil = {
             '            <button id="deleteRow' + newOptions.id + '" class="winui-toolbtn" type="button"><i class="fa fa-trash-o" aria-hidden="true"></i>删除行</button>' +
             '        </div>' +
             '    </div>' +
+            '    <div class="layui-form-mid layui-word-aux" style="width: 100%">' + newOptions.placeholder + '</div>' +
             '    <table class="layui-table" style="width: auto">' +
             '         <thead>' +
             '             <tr id="header' + newOptions.id + '"></tr>' +
-- 
GitLab