From 04958b8f6ad0d950fe253f6ab785fb6505f50ed0 Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Fri, 9 Oct 2020 22:27:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=A1=A8=E6=A0=BC=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=80=89=E6=8B=A9=E6=96=B0=E5=A2=9E=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../public/module/form_operate_top.html       | 64 ++++++++++---------
 .../public/module/form_operate_top.html       |  2 +-
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/application/admin/view/default/public/module/form_operate_top.html b/application/admin/view/default/public/module/form_operate_top.html
index 1a7b2dd28..b2422296b 100644
--- a/application/admin/view/default/public/module/form_operate_top.html
+++ b/application/admin/view/default/public/module/form_operate_top.html
@@ -40,39 +40,41 @@
 {{/if}}
 
 <!-- 字段选择 -->
-<div class="am-fr am-nbfc">
-    <button type="button" class="am-btn am-btn-default am-radius am-btn-xs am-icon-cog" data-am-modal="{target: '#form-table-fields-popup'}"> 设置</button>
-    <div class="am-popup popup-not-title" id="form-table-fields-popup">
-        <div class="am-popup-inner">
-            <span data-am-modal-close class="am-close am-close-alt am-icon-times"></span>
-            <div class="am-popup-bd am-padding-0">
-                <div class="form-table-fields-select-container">
-                    <div class="am-scrollable-vertical form-table-fields-list-container">
-                        {{if !empty($form_user_fields)}}
-                            <div class="am-alert am-margin-bottom-0">
-                                <p>可点击拖拽调整显示顺序</p>
-                            </div>
-                            <ul class="am-list am-list-static am-list-striped am-margin-bottom-0 form-table-fields-content-container">
-                                {{foreach $form_user_fields as $v}}
-                                    <li>
-                                        <label class="am-checkbox-inline">
-                                            <input type="checkbox" name="form_field_checkbox_value" value="{{$v.label}}" data-am-ucheck {{if isset($v['checked']) and $v['checked'] eq 1}}checked{{/if}} />
-                                            <span>{{$v.label}}</span>
-                                        </label>
-                                    </li>
-                                {{/foreach}}
-                            </ul>
-                        {{else /}}
-                            {{include file="public/not_data" /}}
-                        {{/if}}
-                    </div>
-                    <div class="am-padding-sm am-nbfc form-table-fields-button-container">
-                        <button type="button" class="am-btn am-btn-secondary am-radius am-btn-xs form-table-field-checkbox-submit" data-value="{{if array_sum(array_column($form_user_fields, 'checked')) gt 0}}1{{else /}}0{{/if}}" data-checked-text="反选" data-not-checked-text="全选">{{if array_sum(array_column($form_user_fields, 'checked')) gt 0}}反选{{else /}}全选{{/if}}</button>
-                        <button type="button" class="am-btn am-btn-warning am-btn-xs am-radius am-margin-left-sm submit-ajax" data-url="{{:MyUrl('admin/formtable/fieldsselectreset')}}" data-id="{{$form_md5_key}}" data-key="md5_key" data-view="reload" data-is-confirm="0">重置</button>
-                        <button type="button" class="am-btn am-btn-primary am-radius am-btn-xs btn-loading-example am-fr form-table-field-confirm-submit" data-url="{{:MyUrl('admin/formtable/fieldsselectsave')}}" data-am-loading="{loadingText:'处理中...'}">确认</button>
+{{if !isset($form_table['base']['is_fields_sel']) or $form_table['base']['is_fields_sel'] eq 1}}
+    <div class="am-fr am-nbfc">
+        <button type="button" class="am-btn am-btn-default am-radius am-btn-xs am-icon-cog" data-am-modal="{target: '#form-table-fields-popup'}"> 设置</button>
+        <div class="am-popup popup-not-title" id="form-table-fields-popup">
+            <div class="am-popup-inner">
+                <span data-am-modal-close class="am-close am-close-alt am-icon-times"></span>
+                <div class="am-popup-bd am-padding-0">
+                    <div class="form-table-fields-select-container">
+                        <div class="am-scrollable-vertical form-table-fields-list-container">
+                            {{if !empty($form_user_fields)}}
+                                <div class="am-alert am-margin-bottom-0">
+                                    <p>可点击拖拽调整显示顺序</p>
+                                </div>
+                                <ul class="am-list am-list-static am-list-striped am-margin-bottom-0 form-table-fields-content-container">
+                                    {{foreach $form_user_fields as $v}}
+                                        <li>
+                                            <label class="am-checkbox-inline">
+                                                <input type="checkbox" name="form_field_checkbox_value" value="{{$v.label}}" data-am-ucheck {{if isset($v['checked']) and $v['checked'] eq 1}}checked{{/if}} />
+                                                <span>{{$v.label}}</span>
+                                            </label>
+                                        </li>
+                                    {{/foreach}}
+                                </ul>
+                            {{else /}}
+                                {{include file="public/not_data" /}}
+                            {{/if}}
+                        </div>
+                        <div class="am-padding-sm am-nbfc form-table-fields-button-container">
+                            <button type="button" class="am-btn am-btn-secondary am-radius am-btn-xs form-table-field-checkbox-submit" data-value="{{if array_sum(array_column($form_user_fields, 'checked')) gt 0}}1{{else /}}0{{/if}}" data-checked-text="反选" data-not-checked-text="全选">{{if array_sum(array_column($form_user_fields, 'checked')) gt 0}}反选{{else /}}全选{{/if}}</button>
+                            <button type="button" class="am-btn am-btn-warning am-btn-xs am-radius am-margin-left-sm submit-ajax" data-url="{{:MyUrl('admin/formtable/fieldsselectreset')}}" data-id="{{$form_md5_key}}" data-key="md5_key" data-view="reload" data-is-confirm="0">重置</button>
+                            <button type="button" class="am-btn am-btn-primary am-radius am-btn-xs btn-loading-example am-fr form-table-field-confirm-submit" data-url="{{:MyUrl('admin/formtable/fieldsselectsave')}}" data-am-loading="{loadingText:'处理中...'}">确认</button>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+{{/if}}
\ No newline at end of file
diff --git a/application/index/view/default/public/module/form_operate_top.html b/application/index/view/default/public/module/form_operate_top.html
index a1873ba57..05a53fdad 100644
--- a/application/index/view/default/public/module/form_operate_top.html
+++ b/application/index/view/default/public/module/form_operate_top.html
@@ -40,7 +40,7 @@
 {{/if}}
 
 <!-- 字段选择 -->
-{{if !empty($user)}}
+{{if !empty($user) and (!isset($form_table['base']['is_fields_sel']) or $form_table['base']['is_fields_sel'] eq 1)}}
     <div class="am-fr am-nbfc">
         <button type="button" class="am-btn am-btn-default am-radius am-btn-xs am-icon-cog" data-am-modal="{target: '#form-table-fields-popup'}"> 设置</button>
         <div class="am-popup popup-not-title" id="form-table-fields-popup">
-- 
GitLab