From 933ff444e6b5db2ed953ad8dfce7e3e64a406c74 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sat, 18 Feb 2023 23:25:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/view/default/lib/module/user.html     | 10 +++++-----
 app/index/view/default/lib/module/user.html     | 10 +++++-----
 app/lang/en.php                                 |  5 ++++-
 app/lang/zh.php                                 |  5 ++++-
 extend/base/Page.php                            |  2 +-
 public/static/admin/default/css/index.index.css |  6 ++++++
 public/static/admin/default/js/index.js         |  4 ++--
 public/static/common/css/common.css             |  5 ++++-
 public/static/common/js/common.js               | 17 +++++++++++++++++
 9 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/app/admin/view/default/lib/module/user.html b/app/admin/view/default/lib/module/user.html
index e30d5b936..85b80a765 100644
--- a/app/admin/view/default/lib/module/user.html
+++ b/app/admin/view/default/lib/module/user.html
@@ -4,19 +4,19 @@
         <li class="am-text-truncate">{{$module_data.user.user_name_view}}</li>
         <li>
             {{if !empty($module_data['user']['username'])}}
-                <a href="javascript:;" class="am-icon-user am-text-grey am-margin-right-sm" data-am-popover="{content: '{{:MyLang('user_username_title')}}：{{$module_data.user.username}}{{if !empty($module_data['user']['nickname'])}}<br />{{:MyLang('user_nickname_title')}}：{{$module_data.user.nickname}}{{/if}}', trigger: 'hover focus', theme: 'sm'}"></a>
+                <a href="javascript:;" class="am-icon-user am-text-grey am-margin-right-sm text-copy-submit" data-value="{{$module_data.user.username}}" data-am-popover="{content: '{{:MyLang('user_username_title')}}：{{$module_data.user.username}}{{if !empty($module_data['user']['nickname'])}}<br />{{:MyLang('user_nickname_title')}}：{{$module_data.user.nickname}}{{/if}}', trigger: 'hover focus', theme: 'sm'}"></a>
             {{/if}}
             {{if !empty($module_data['user']['number_code'])}}
-                <a href="javascript:;" class="am-icon-qrcode am-text-grey am-margin-right-sm" data-am-popover="{content: '{{$module_data.user.number_code}}', trigger: 'hover focus', theme: 'sm'}"></a>
+                <a href="javascript:;" class="am-icon-qrcode am-text-grey am-margin-right-sm text-copy-submit" data-value="{{$module_data.user.number_code}}" data-am-popover="{content: '{{$module_data.user.number_code}}', trigger: 'hover focus', theme: 'sm'}"></a>
             {{/if}}
             {{if !empty($module_data['user']['mobile'])}}
-                <a href="javascript:;" class="am-icon-phone-square am-text-grey am-margin-right-sm" data-am-popover="{content: '{{$module_data.user.mobile}}', trigger: 'hover focus', theme: 'sm'}"></a>
+                <a href="javascript:;" class="am-icon-phone-square am-text-grey am-margin-right-sm text-copy-submit" data-value="{{$module_data.user.mobile}}" data-am-popover="{content: '{{$module_data.user.mobile}}', trigger: 'hover focus', theme: 'sm'}"></a>
             {{/if}}
             {{if !empty($module_data['user']['email'])}}
-                <a href="javascript:;" class="am-icon-envelope am-text-grey am-margin-right-sm" data-am-popover="{content: '{{$module_data.user.email}}', trigger: 'hover focus', theme: 'sm'}"></a>
+                <a href="javascript:;" class="am-icon-envelope am-text-grey am-margin-right-sm text-copy-submit" data-value="{{$module_data.user.email}}" data-am-popover="{content: '{{$module_data.user.email}}', trigger: 'hover focus', theme: 'sm'}"></a>
             {{/if}}
             {{if !empty($module_data['user']['gender_text'])}}
-                <a href="javascript:;" class="am-icon-child am-text-grey" data-am-popover="{content: '{{$module_data.user.gender_text}}', trigger: 'hover focus', theme: 'sm'}"></a>
+                <a href="javascript:;" class="am-icon-child am-text-grey text-copy-submit" data-value="{{$module_data.user.gender_text}}" data-am-popover="{content: '{{$module_data.user.gender_text}}', trigger: 'hover focus', theme: 'sm'}"></a>
             {{/if}}
         </li>
     </ul>
diff --git a/app/index/view/default/lib/module/user.html b/app/index/view/default/lib/module/user.html
index e30d5b936..85b80a765 100644
--- a/app/index/view/default/lib/module/user.html
+++ b/app/index/view/default/lib/module/user.html
@@ -4,19 +4,19 @@
         <li class="am-text-truncate">{{$module_data.user.user_name_view}}</li>
         <li>
             {{if !empty($module_data['user']['username'])}}
-                <a href="javascript:;" class="am-icon-user am-text-grey am-margin-right-sm" data-am-popover="{content: '{{:MyLang('user_username_title')}}：{{$module_data.user.username}}{{if !empty($module_data['user']['nickname'])}}<br />{{:MyLang('user_nickname_title')}}：{{$module_data.user.nickname}}{{/if}}', trigger: 'hover focus', theme: 'sm'}"></a>
+                <a href="javascript:;" class="am-icon-user am-text-grey am-margin-right-sm text-copy-submit" data-value="{{$module_data.user.username}}" data-am-popover="{content: '{{:MyLang('user_username_title')}}：{{$module_data.user.username}}{{if !empty($module_data['user']['nickname'])}}<br />{{:MyLang('user_nickname_title')}}：{{$module_data.user.nickname}}{{/if}}', trigger: 'hover focus', theme: 'sm'}"></a>
             {{/if}}
             {{if !empty($module_data['user']['number_code'])}}
-                <a href="javascript:;" class="am-icon-qrcode am-text-grey am-margin-right-sm" data-am-popover="{content: '{{$module_data.user.number_code}}', trigger: 'hover focus', theme: 'sm'}"></a>
+                <a href="javascript:;" class="am-icon-qrcode am-text-grey am-margin-right-sm text-copy-submit" data-value="{{$module_data.user.number_code}}" data-am-popover="{content: '{{$module_data.user.number_code}}', trigger: 'hover focus', theme: 'sm'}"></a>
             {{/if}}
             {{if !empty($module_data['user']['mobile'])}}
-                <a href="javascript:;" class="am-icon-phone-square am-text-grey am-margin-right-sm" data-am-popover="{content: '{{$module_data.user.mobile}}', trigger: 'hover focus', theme: 'sm'}"></a>
+                <a href="javascript:;" class="am-icon-phone-square am-text-grey am-margin-right-sm text-copy-submit" data-value="{{$module_data.user.mobile}}" data-am-popover="{content: '{{$module_data.user.mobile}}', trigger: 'hover focus', theme: 'sm'}"></a>
             {{/if}}
             {{if !empty($module_data['user']['email'])}}
-                <a href="javascript:;" class="am-icon-envelope am-text-grey am-margin-right-sm" data-am-popover="{content: '{{$module_data.user.email}}', trigger: 'hover focus', theme: 'sm'}"></a>
+                <a href="javascript:;" class="am-icon-envelope am-text-grey am-margin-right-sm text-copy-submit" data-value="{{$module_data.user.email}}" data-am-popover="{content: '{{$module_data.user.email}}', trigger: 'hover focus', theme: 'sm'}"></a>
             {{/if}}
             {{if !empty($module_data['user']['gender_text'])}}
-                <a href="javascript:;" class="am-icon-child am-text-grey" data-am-popover="{content: '{{$module_data.user.gender_text}}', trigger: 'hover focus', theme: 'sm'}"></a>
+                <a href="javascript:;" class="am-icon-child am-text-grey text-copy-submit" data-value="{{$module_data.user.gender_text}}" data-am-popover="{content: '{{$module_data.user.gender_text}}', trigger: 'hover focus', theme: 'sm'}"></a>
             {{/if}}
         </li>
     </ul>
diff --git a/app/lang/en.php b/app/lang/en.php
index 89dbc3835..3de5163a5 100644
--- a/app/lang/en.php
+++ b/app/lang/en.php
@@ -39,6 +39,8 @@ return [
         'goods_id_empty_tips'               => 'Item ID data',
         'input_empty_tips'                  => 'Please enter data',
         'store_enabled_tips'                => 'Your browser does not support local storage. Please disable Private Mode or upgrade to a modern browser.',
+        'copy_fail'                         => 'Copy Failed',
+        'copy_success'                      => 'Copy Succeeded',
         // 上传下载
         'get_loading_tips'                  => 'Getting...',
         'download_loading_tips'             => 'Downloading...',
@@ -2312,7 +2314,8 @@ return [
             // 分页
             'page'          => [
                 'each_page_name'                    => 'Each Page',
-                'page_unit'                         => 'Strip',
+                'page_strip'                        => 'Strip',
+                'page_unit'                         => 'Page',
                 'jump_to_text'                      => 'Jump to',
                 'data_total'                        => 'Total {:total} Data',
                 'page_total'                        => 'Total {:total} Page',
diff --git a/app/lang/zh.php b/app/lang/zh.php
index e02c26201..826efe2b0 100755
--- a/app/lang/zh.php
+++ b/app/lang/zh.php
@@ -39,6 +39,8 @@ return [
         'goods_id_empty_tips'               => '商品ID数据',
         'input_empty_tips'                  => '请输入数据',
         'store_enabled_tips'                => '您的浏览器不支持本地存储。请禁用“专用模式”，或升级到现代浏览器。',
+        'copy_fail'                         => '复制失败',
+        'copy_success'                      => '复制成功',
         // 上传下载
         'get_loading_tips'                  => '正在获取中...',
         'download_loading_tips'             => '正在下载中...',
@@ -2319,7 +2321,8 @@ return [
             // 分页
             'page'          => [
                 'each_page_name'                    => '每页',
-                'page_unit'                         => '条',
+                'page_strip'                        => '条',
+                'page_unit'                         => '页',
                 'jump_to_text'                      => '跳转到',
                 'data_total'                        => '共 {:total} 条数据',
                 'page_total'                        => '共 {:total} 页',
diff --git a/extend/base/Page.php b/extend/base/Page.php
index 91172c4bd..69e8c0c72 100755
--- a/extend/base/Page.php
+++ b/extend/base/Page.php
@@ -144,7 +144,7 @@ class Page
 
 		$this->html .= '<span class="am-margin-left-sm">'.MyLang('common_extend.base.page.each_page_name').'</span>';
 		$this->html .= '<input type="text" min="1" data-is-clearout="0" class="am-form-field am-inline-block am-text-center am-margin-horizontal-xs am-radius pagination-input" value="'.$this->page_size.'" onchange="window.location.href=\''.str_replace(['&page_size='.$this->page_size, 'page_size='.$this->page_size.'&'], '', $this->url).$this->page_join.'page_size=\'+(isNaN(parseInt(this.value)) ? 10 : parseInt(this.value) || 10);" onclick="this.select()" />';
-		$this->html .= '<span>'.MyLang('common_extend.base.page.page_unit').'</span>';
+		$this->html .= '<span>'.MyLang('common_extend.base.page.page_strip').'</span>';
 
 		$this->html .= '<span class="am-margin-left-sm">'.MyLang('common_extend.base.page.jump_to_text').'</span>';
 		$this->html .= '<input type="text" min="1" data-is-clearout="0" class="am-form-field am-inline-block am-text-center am-margin-horizontal-xs am-radius pagination-input" value="'.$this->page.'" onchange="window.location.href=\''.$this->url.$this->page_join.'page=\'+(isNaN(parseInt(this.value)) ? 1 : parseInt(this.value) || 1);" onclick="this.select()" />';
diff --git a/public/static/admin/default/css/index.index.css b/public/static/admin/default/css/index.index.css
index ebba64c56..34f6e39f0 100644
--- a/public/static/admin/default/css/index.index.css
+++ b/public/static/admin/default/css/index.index.css
@@ -153,6 +153,12 @@
     background: transparent;
     display: none;
 }
+.window-layer-resize-bar {
+    display: none;
+}
+.window-layer-alone-layer .window-layer-resize-bar {
+    display: block;
+}
 .window-layer-resize-bar>[class^=window-layer-resize-item-] {
     position: absolute;
     z-index: 3;
diff --git a/public/static/admin/default/js/index.js b/public/static/admin/default/js/index.js
index 4f32f167d..580782ccc 100755
--- a/public/static/admin/default/js/index.js
+++ b/public/static/admin/default/js/index.js
@@ -409,7 +409,7 @@ $(function()
     });
 
     // 弹窗拖拽
-    $(document).on('mousedown', '.window-layer-tab-bar', function(pe)
+    $(document).on('mousedown', '.window-layer-alone-layer .window-layer-tab-bar', function(pe)
     {
         var is_move = true;
         var $content = $('#ifcontent');
@@ -481,7 +481,7 @@ $(function()
     });
 
     // 独立窗口拉动大小
-    $(document).on('mousedown', '.window-layer-resize-bar div[class^="window-layer-resize-item-"]', function(pe)
+    $(document).on('mousedown', '.window-layer-alone-layer .window-layer-resize-bar div[class^="window-layer-resize-item-"]', function(pe)
     {
         var is_move = true;
         var $content = $('#ifcontent');
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index 6d71ce0e0..3d09f1498 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -20,7 +20,7 @@ html input[disabled] { cursor: default !important; color: #b1b1b1 !important; ba
 /* 没数据 */
 .table-no {
     text-align: center;
-    padding: 115px 0;
+    padding: 20px 0;
     background: #FFF;
     color: #b9b7b7;
 }
@@ -1171,6 +1171,9 @@ button.colorpicker-submit img {
 .am-table-scrollable-horizontal ul.user-base li:first-child {
     margin-bottom: 7px;
 }
+.am-table-scrollable-horizontal .table-no {
+    padding: 110px 0px;
+}
 
 /**
  * 表格-操作栏更多操作列表样式
diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js
index 9a4d9b650..c6466b351 100755
--- a/public/static/common/js/common.js
+++ b/public/static/common/js/common.js
@@ -4667,4 +4667,21 @@ $(function()
 	    // 关闭弹窗
 	    $(this).parents('.am-modal-dialog').find('.am-modal-hd .am-close').trigger('click');
     });
+
+    // 文本信息复制
+    var text_copy_clipboard = new ClipboardJS('.text-copy-submit',
+    {
+        text: function(e)
+        {
+            return $(e).data('value');
+        }
+    });
+    text_copy_clipboard.on('success', function(e)
+    {
+        Prompt(window['lang_copy_success'] || '复制成功', 'success');
+    });
+    text_copy_clipboard.on('error', function(e)
+    {
+        Prompt(window['lang_copy_fail'] || '复制失败');
+    });
 });
\ No newline at end of file