Merge remote-tracking branch 'origin/dev' into dev

fs-danaus

2024-06-28 fe056cd50bb323f6434f8b472a8f7cc0d79f0ded

Merge remote-tracking branch 'origin/dev' into dev

 WebRoot/general/CustomControl/editLayout.html

@@ -57,7 +57,7 @@
                <div class="layui-tab-item layui-show">
                  <div class="flex flex-end">
                    <div>
                      <button class="btn-group" id="resetCurrentGrid">恢复初始</button>
                      <button class="btn-group" id="resetCurrentGrid">重置</button>
                    </div>
                  </div>
                  <div class="vue-component-div absolute">

 WebRoot/general/CustomControl/js/vueComponent.js

@@ -367,7 +367,7 @@
              <div class="layui-tab-item layui-show">
                <div class="flex flex-end">
                  <div>
                    <button class="btn-group" id="resetCurrentTable">恢复初始</button>
                    <button class="btn-group" id="resetCurrentTable">重置</button><!--恢复初始 -->
                  </div>
                </div>
                <div class="vue-component-div drag-in-component drag-in-component-table flex">