Merge branch release/21.7.8 of zentao/zentaopms (#13214)

module/upgrade/js/consistency.ui.js

@@ -23,7 +23,7 @@ function updateProgressInterval()
             if(result.finished)
             {
                 clearInterval(interval);
-                window.location.reload();
+                $('#continueBtn').removeClass('disabled').attr('onclick', 'loadCurrentPage()');
             }
         })
     }, 500);

module/upgrade/js/execute.ui.js

@@ -50,7 +50,7 @@ $(function()
                         $('#changesBox .change-item').removeClass('executed');
                         executedKeys.forEach(function(key)
                         {
-                            $('#changesBox .change-item[data-key="' + key + '"]').addClass('executed');
+                            $('#changesBox .change-item[data-key="' + key + '"]').addClass('executed').find('.icon-more-circle').replaceWith('<i class="icon icon-check-circle text-xl text-success"></i>');
                         });
                         $('#executedCount').text(executedCount);
 
@@ -112,7 +112,7 @@ $(function()
             /* 更新版本列表状态为正在升级 */
             const $versionItem = $('#versionsBox .version-item[data-version="' + currentVersion + '"]');
             $versionItem[0].scrollIntoView({behavior: 'smooth', block: 'nearest'});
-            $versionItem.find('.icon').replaceWith('<i class="icon icon-spinner-indicator text-xl text-gray-400"></i>');
+            $versionItem.find('.icon-clock').replaceWith('<i class="icon icon-spinner-indicator text-xl text-gray-400"></i>');
 
             /* 启动轮询获取升级进度 */
             const pollPromise = fetchProgress(currentVersion);
@@ -146,7 +146,7 @@ $(function()
             await pollPromise;
 
             /* 更新版本列表状态为升级完成 */
-            $versionItem.find('.icon').replaceWith('<i class="icon icon-check-circle text-xl text-success"></i>');
+            $versionItem.find('.icon-spinner-indicator').replaceWith('<i class="icon icon-check-circle text-xl text-success"></i>');
 
             /* 更新版本升级进度条 */
             const executedVersions = versionIndex + 1;
@@ -158,7 +158,7 @@ $(function()
             if(isLastVersion && upgradeResult.load)
             {
                 abortUpgrade();
-                window.location.href = upgradeResult.load;
+                $('#continueBtn').removeClass('disabled').attr('href', upgradeResult.load);
                 return;
             }
 

module/upgrade/lang/en.php

@@ -56,8 +56,8 @@ EOT;
 
 $lang->upgrade->confirmBackup      = 'I have backed up the database';
 $lang->upgrade->setStatusFileTitle = 'Please complete the following actions';
-$lang->upgrade->createWinFile      = 'Open command line and execute <span class="font-bold text-danger">echo > %s</span>';
-$lang->upgrade->createLinuxFile    = 'Execute <span class="font-bold text-danger">touch %s</span> in the command line';
+$lang->upgrade->createWinFile      = 'Open command line and execute <span id="command" class="font-bold text-danger">echo > %s</span>';
+$lang->upgrade->createLinuxFile    = 'Execute <span id="command" class="font-bold text-danger">touch %s</span> in the command line';
 $lang->upgrade->deleteStatusFile   = 'Or delete <span class="font-bold text-danger">%s</span> and create <span class="font-bold text-danger">ok.txt</span> and leave it blank.';
 $lang->upgrade->confirmStatusFile  = 'I have read and done as instructed above.';
 

module/upgrade/lang/zh-cn.php

@@ -56,8 +56,8 @@ EOT;
 
 $lang->upgrade->confirmBackup      = '我已经备份了数据库';
 $lang->upgrade->setStatusFileTitle = '升级之前请先完成下面的操作';
-$lang->upgrade->createWinFile      = '打开命令行，执行 <span class="font-bold text-danger">echo > %s</span>';
-$lang->upgrade->createLinuxFile    = '在命令行执行 <span class="font-bold text-danger">touch %s</span>';
+$lang->upgrade->createWinFile      = '打开命令行，执行 <span id="command" class="font-bold text-danger">echo > %s</span>';
+$lang->upgrade->createLinuxFile    = '在命令行执行 <span id="command" class="font-bold text-danger">touch %s</span>';
 $lang->upgrade->deleteStatusFile   = '或者删除 <span class="font-bold text-danger">%s</span> 这个文件，重新创建一个 <span class="font-bold text-danger">ok.txt</span> 文件，不需要内容。';
 $lang->upgrade->confirmStatusFile  = '我已经仔细阅读上面提示且完成上述工作';
 

module/upgrade/ui/command.html.php

@@ -41,7 +41,7 @@ div
         div
         (
             setID('command'),
-            setClass('pre rounded-md bg-gray-100 px-8 py-6'),
+            setClass('pre-wrap break-all break-words rounded-md bg-gray-100 px-8 py-6'),
             setStyle('height', 'calc(100% - 8rem)'),
             $command
         ),

module/upgrade/ui/consistency.html.php

@@ -20,8 +20,8 @@ div
     setStyle(['padding' => '3rem 4rem', 'height' => '100vh', 'overflow' => 'hidden']),
     col
     (
-        setClass('container rounded-md bg-white gap-5 h-full'),
-        setStyle(['padding' => '1.5rem 2rem']),
+        setClass('container rounded-md bg-white gap-5'),
+        setStyle(['padding' => '1.5rem 2rem', 'max-height' => '100%']),
         div
         (
             setClass('text-xl font-medium'),
@@ -39,17 +39,17 @@ div
             setStyle(['max-height' => 'calc(100% - 5rem)']),
             $hasError ? html($alterSQL . ';') : null
         ),
-        $hasError ? div
+        div
         (
             setClass('text-center'),
             btn
             (
+                setID('continueBtn'),
                 setClass('px-10'),
-                set::type('primary'),
-                on::click('loadCurrentPage()'),
-                $lang->refresh
+                set::type('primary disabled'),
+                $hasError ? $lang->refresh : $lang->upgrade->continue
             )
-        ) : null
+        )
     )
 );
 

module/upgrade/ui/execute.html.php

@@ -53,11 +53,9 @@ $buildVersions = function() use ($upgradeVersions, $editionNames)
     return $versions;
 };
 
-$buildChanges = function() use ($lang, $upgradeChanges)
+$buildChanges = function() use ($upgradeChanges)
 {
-    $changes    = [];
-    $bgColors   = ['create' => 'success-pale', 'update' => 'primary-pale', 'delete' => 'danger-pale'];
-    $textColors = ['create' => 'text-success', 'update' => 'text-primary', 'delete' => 'text-danger'];
+    $changes = [];
     foreach($upgradeChanges as $key => $change)
     {
         $sql = json_encode($change['sql'] ?? []);
@@ -65,10 +63,10 @@ $buildChanges = function() use ($lang, $upgradeChanges)
         (
             setClass('change-item items-center gap-3'),
             setData(['key' => $key, 'change' => $change]),
-            span
+            icon
             (
-                setClass("label {$bgColors[$change['mode']]} {$textColors[$change['mode']]} px-2.5 py-1"),
-                $lang->upgrade->changeModes[$change['mode']]
+                setClass('text-xl text-gray-400'),
+                'more-circle'
             ),
             span
             (
@@ -79,7 +77,7 @@ $buildChanges = function() use ($lang, $upgradeChanges)
                 set::href("javascript:showSQL({$sql})"),
                 icon
                 (
-                    setClass('text-gray-400 text-lg'),
+                    setClass('text-lg text-gray-400'),
                     'fields'
                 ),
             ) : null
@@ -107,7 +105,7 @@ div
         row
         (
             setClass('bg-gray-100 gap-2 p-2'),
-            setStyle(['max-height' => 'calc(100% - 4rem)']),
+            setStyle(['max-height' => 'calc(100% - 6rem)']),
             col
             (
                 setID('versionsBlock'),
@@ -179,6 +177,16 @@ div
                     $buildChanges
                 )
             )
+        ),
+        div
+        (
+            setClass('center'),
+            a
+            (
+                setID('continueBtn'),
+                setClass('btn primary w-24 disabled'),
+                $lang->upgrade->continue
+            )
         )
     )
 );

module/upgrade/ui/setstatusfile.html.php

@@ -12,6 +12,9 @@ namespace zin;
 
 set::zui(true);
 
+jsVar('copySuccess', $lang->upgrade->copySuccess);
+jsVar('copyFail', $lang->upgrade->copyFail);
+
 $cmd = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' ? $lang->upgrade->createWinFile : $lang->upgrade->createLinuxFile;
 
 div
@@ -28,7 +31,7 @@ div
         ),
         div
         (
-            setClass('pre rounded-md bg-gray-100 px-8 py-6'),
+            setClass('pre-wrap break-all break-words rounded-md bg-gray-100 px-8 py-6'),
             ul
             (
                 li(html(sprintf($cmd, $statusFile))),
@@ -40,9 +43,15 @@ div
             on::change('confirmStatusFile'),
             $lang->upgrade->confirmStatusFile
         ),
-        div
+        row
         (
-            setClass('center'),
+            setClass('justify-center gap-4'),
+            a
+            (
+                setClass('btn success w-24'),
+                set::href('javascript:copyCommand("#command");'),
+                $lang->upgrade->copyCommand
+            ),
             a
             (
                 setID('confirm'),