feat: release 6.0.0

modstart · modstart · commit 1673cd027f35 · 2022-10-25T14:39:10.000+08:00
diff --git a/app/Constant/AppConstant.php b/app/Constant/AppConstant.php
@@ -6,5 +6,5 @@ class AppConstant
 {
     const APP = 'blog';
     const APP_NAME = 'ModStartBlog';
-    const VERSION = '5.9.0';
+    const VERSION = '6.0.0';
 }
diff --git a/module/ModuleStore/Docs/release.md b/module/ModuleStore/Docs/release.md
@@ -1,4 +1,4 @@
-## 1.9.0
+## 1.9.0 预览宝功能支持，升级逻辑优化
 
 - 新增：模块市场预览包功能支持
 - 新增：模块管理模块升级判断逻辑修改
diff --git a/module/ModuleStore/config.json b/module/ModuleStore/config.json
@@ -9,7 +9,8 @@
         "Admin"
     ],
     "tags": [
-        "模块市场"
+        "模块市场",
+        "模块管理"
     ],
     "require": [
         "Vendor:>=1.4.0"
diff --git a/module/Vendor/Docs/release.md b/module/Vendor/Docs/release.md
@@ -10,6 +10,7 @@
 - 新增：图片压缩Provider
 - 新增：ProviderTrait新增是否排序自动检测
 - 新增：魔众API新增随机头像接口
+- 优化：安装向导根路径配置错误检测提醒
 - 优化：内容自动审核链接逻辑处理
 - 优化：升级Laravel版本造成的安装路径检测异常
 
diff --git a/module/Vendor/Installer/function.php b/module/Vendor/Installer/function.php
@@ -204,6 +204,11 @@ function text_error($msg, $solutionUrl = null, $count = true)
     echo '<div class="ub-alert ub-alert-danger">× ' . $msg . ' ' . ($solutionUrl ? '<a target="_blank" href="' . $solutionUrl . '">解决办法</a>' : '') . '</div>';
 }
 
+function text_warning($msg, $solutionUrl = null)
+{
+    echo '<div class="ub-alert ub-alert-warning">? ' . $msg . ' ' . ($solutionUrl ? '<a target="_blank" href="' . $solutionUrl . '">解决办法</a>' : '') . '</div>';
+}
+
 function error_counter($inc = 1)
 {
     static $error = 0;
diff --git a/module/Vendor/Installer/install.php b/module/Vendor/Installer/install.php
@@ -171,6 +171,14 @@ function doStepEnv(){
                                     <div>- 配置Nginx/Apache，保证访问 <a href="/install/ping" target="_blank">/install/ping</a> 出现 ok 字样。</div>
                                 </div>
                             </div>
+                            <div data-public-install-path-warning style="display:none;">
+                                <?php text_warning('安装路径为 public/install.php ，可能设置错了网站根目录，请仔细检查','https://modstart.com/doc/install/start.html#%E5%8F%82%E8%80%83%E9%85%8D%E7%BD%AE'); ?>
+                            </div>
+                            <script>
+                                if(window.location.href.indexOf('public/install.php')>0){
+                                    document.querySelector('[data-public-install-path-warning]').style.display = 'block';
+                                }
+                            </script>
                         </div>
                     </div>
                     <div class="content-item-foot">
diff --git a/module/Vendor/Tecmz/Tecmz.php b/module/Vendor/Tecmz/Tecmz.php
@@ -69,7 +69,9 @@ private function request($gate, $param = [])
                 if ($this->debug) {
             Log::debug('TecmzApi -> ' . $url . ' -> ' . json_encode($param, JSON_UNESCAPED_UNICODE));
         }
-        return CurlUtil::postJSONBody($url, $param);
+        return CurlUtil::postJSONBody($url, $param, [
+            'timeout' => 60 * 10,
+        ]);
     }
 
     
diff --git a/public/asset/common/gridManager.js b/public/asset/common/gridManager.js
diff --git a/public/asset/theme/default/style.css b/public/asset/theme/default/style.css
diff --git a/vendor/modstart/modstart/asset/common/gridManager.js b/vendor/modstart/modstart/asset/common/gridManager.js
diff --git a/vendor/modstart/modstart/asset/theme/default/style.css b/vendor/modstart/modstart/asset/theme/default/style.css
diff --git a/vendor/modstart/modstart/resources/asset/src/common/gridManager.js b/vendor/modstart/modstart/resources/asset/src/common/gridManager.js
@@ -33,6 +33,7 @@ var GridManager = function (opt) {
         editDialogSize: ['90%', '90%'],
         showDialogSize: ['90%', '90%'],
         importDialogSize: ['90%', '90%'],
+        pageJumpEnable: false,
         lang: {
             loading: 'Loading',
             noRecords: 'No Records',
@@ -166,13 +167,17 @@ var GridManager = function (opt) {
                         data: data.records,
                         limit: data.pageSize,
                     });
+                    var pageLayout = ['limit', 'prev', 'page', 'next', 'count'];
+                    if(option.pageJumpEnable){
+                        pageLayout.push('skip');
+                    }
                     layui.laypage.render({
                         elem: option.id + 'Pager',
                         curr: data.page,
                         count: data.total,
                         limit: data.pageSize,
                         limits: option.pageSizes,
-                        layout: ['limit', 'prev', 'page', 'next', 'count',],
+                        layout: pageLayout,
                         jump: function (obj, first) {
                             if (!first) {
                                 lister.setPage(obj.curr);
diff --git a/vendor/modstart/modstart/resources/asset/src/sui/adapt/layui.less b/vendor/modstart/modstart/resources/asset/src/sui/adapt/layui.less
@@ -144,3 +144,14 @@
         border: none;
     }
 }
+
+.layui-table-tool {
+    .layui-btn-container{
+        .btn{
+          margin-right:0.2rem;
+          &:hover{
+            background-color: #EEE;
+          }
+        }
+    }
+}
diff --git a/vendor/modstart/modstart/resources/asset/src/sui/bricks/component/nav/nav.html b/vendor/modstart/modstart/resources/asset/src/sui/bricks/component/nav/nav.html
@@ -79,9 +79,12 @@
     <div class="block-breaker"></div>
 
     <div class="ub-nav-group">
-        <div class="group" data-repeat="5">
+        <div class="group" data-repeat="3">
             <div class="label">
-                <div class="text">名称</div>
+                <div class="text">
+                    <i class="iconfont icon-home"></i>
+                    名称
+                </div>
             </div>
             <div class="items">
                 <a href="#">全部</a>
@@ -93,6 +96,21 @@
 
     <div class="block-breaker"></div>
 
+    <div class="ub-nav-group bare">
+        <div class="group" data-repeat="3">
+            <div class="items">
+                <a href="#" class="active">
+                    <i class="iconfont icon-category"></i>
+                    全部分类
+                </a>
+                <a href="#" class="active">分类A</a>
+                <a href="#" data-repeat="8">分类B</a>
+            </div>
+        </div>
+    </div>
+
+    <div class="block-breaker"></div>
+
     <div class="ub-nav-tab">
         <a href="#">全部</a>
         <a href="#" class="active">分类A</a>
diff --git a/vendor/modstart/modstart/resources/asset/src/sui/bricks/component/nav/nav.less b/vendor/modstart/modstart/resources/asset/src/sui/bricks/component/nav/nav.less
@@ -195,11 +195,17 @@
 
 
 .ub-nav-group {
-    background: #FFFFFF;
+    background: var(--color-content-bg);
     border-radius: var(--size-radius);
 
+    &.bare {
+        .group {
+            padding-left: 0rem;
+        }
+    }
+
     .group {
-        background: #FFF;
+        background: var(--color-content-bg);
         position: relative;
         padding-left: 6rem;
         overflow: hidden;
diff --git a/vendor/modstart/modstart/src/Core/Util/FileUtil.php b/vendor/modstart/modstart/src/Core/Util/FileUtil.php
@@ -541,7 +541,9 @@ public static function savePathToLocalTemp($path, $ext = '')
             if (StrUtil::startWith($path, '//')) {
                 $path = 'http://' . $path;
             }
-            $image = CurlUtil::getRaw($path);
+            $image = CurlUtil::getRaw($path, [], [
+                'timeout' => 60 * 10,
+            ]);
             if (empty($image)) {
                 return null;
             }
diff --git a/vendor/modstart/modstart/src/Data/AbstractDataStorage.php b/vendor/modstart/modstart/src/Data/AbstractDataStorage.php
@@ -56,7 +56,7 @@ abstract public function delete($file);
 
     public function softDelete($file)
     {
-        $this->move($file, self::DATA . '/_trash/' . date('Ymd_H') . '/' . $file);
+        return $this->move($file, self::DATA . '/_trash/' . date('Ymd_H') . '/' . $file);
     }
 
     abstract public function put($file, $content);
diff --git a/vendor/modstart/modstart/src/Detail/Detail.php b/vendor/modstart/modstart/src/Detail/Detail.php
@@ -204,6 +204,7 @@ public function __call($method, $arguments)
             case 'canBatchSelect':
             case 'batchOperatePrepend':
             case 'gridToolbar':
+            case 'pageJumpEnable':
             case 'textEdit':
                 return $this;
         }
diff --git a/vendor/modstart/modstart/src/Field/Text.php b/vendor/modstart/modstart/src/Field/Text.php
@@ -4,7 +4,35 @@
 namespace ModStart\Field;
 
 
+use ModStart\Core\Util\StrUtil;
+
 class Text extends AbstractField
 {
 
-}
+    protected function setup()
+    {
+        $this->addVariables([
+            'autoTrim' => false,
+        ]);
+    }
+
+    /**
+     * 保存时自动清除空格
+     * @param bool $enable
+     * @return $this
+     */
+    public function autoTrim($enable = true)
+    {
+        $this->addVariables(['autoTrim' => $enable]);
+        return $this;
+    }
+
+    public function prepareInput($value, $dataSubmitted)
+    {
+        if ($this->variables['autoTrim']) {
+            $value = StrUtil::filterSpecialChars($value);
+            $value = trim($value);
+        }
+        return $value;
+    }
+}
diff --git a/vendor/modstart/modstart/src/Form/Form.php b/vendor/modstart/modstart/src/Form/Form.php
@@ -727,6 +727,7 @@ public function __call($method, $arguments)
             case 'canBatchSelect':
             case 'batchOperatePrepend':
             case 'gridToolbar';
+            case 'pageJumpEnable';
             case 'textEdit':
                 return $this;
         }
diff --git a/vendor/modstart/modstart/src/Grid/Grid.php b/vendor/modstart/modstart/src/Grid/Grid.php
@@ -74,6 +74,7 @@
  * @method Grid|mixed defaultPageSize($value = null)
  * @method Grid|mixed pageSizes($value = null)
  * @method Grid|mixed gridToolbar($value = []),
+ * @method Grid|mixed pageJumpEnable($enable = null),
  *
  * $value = function(Grid $grid, $items){ return $items; }
  * @method Grid|mixed hookPrepareItems($value = null)
@@ -144,7 +145,8 @@ class Grid
         'gridRowCols',
         'defaultPageSize',
         'pageSizes',
-        'gridToolbar'
+        'gridToolbar',
+        'pageJumpEnable',
     ];
     /**
      * 运行引擎 @see GridEngine
@@ -198,6 +200,8 @@ class Grid
     private $pageSizes = [10, 50, 100];
     /** @var string[] grid toolbar */
     private $gridToolbar = [];
+    /** @var bool page jump enable */
+    private $pageJumpEnable = false;
     /** @var Closure 渲染前置处理Items */
     private $hookPrepareItems = null;
     /** @var array 渲染在Table顶部的区域 */
diff --git a/vendor/modstart/modstart/src/Misc/Zipper/Repositories/ZipRepository.php b/vendor/modstart/modstart/src/Misc/Zipper/Repositories/ZipRepository.php
@@ -100,6 +100,20 @@ public function getFileStream($pathInArchive)
         return $this->archive->getStream($pathInArchive);
     }
 
+    private function isUtf8($string)
+    {
+        return preg_match('%^(?:
+      [\x09\x0A\x0D\x20-\x7E]            # ASCII
+    | [\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
+    | \xE0[\xA0-\xBF][\x80-\xBF]         # excluding overlongs
+    | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
+    | \xED[\x80-\x9F][\x80-\xBF]         # excluding surrogates
+    | \xF0[\x90-\xBF][\x80-\xBF]{2}      # planes 1-3
+    | [\xF1-\xF3][\x80-\xBF]{3}          # planes 4-15
+    | \xF4[\x80-\x8F][\x80-\xBF]{2}      # plane 16
+)*$%xs', $string);
+    }
+
     /**
      * Will loop over every item in the archive and will execute the callback on them
      * Will provide the filename for every item
@@ -109,30 +123,38 @@ public function getFileStream($pathInArchive)
     public function each($callback)
     {
         $records = [];
-        $hasUtf8 = false;
+        // $hasUtf8 = false;
         for ($i = 0; $i < $this->archive->numFiles; ++$i) {
             //skip if folder
             $stats = $this->archive->statIndex($i);
             if ($stats['size'] === 0 && $stats['crc'] === 0) {
                 continue;
             }
             $name = $this->archive->getNameIndex($i, 0x0001 << 6);
-            $encoding = mb_detect_encoding($name, ['GBK', 'UTF-8']);
-            // var_dump($encoding);
-            if ('UTF-8' === $encoding) {
-                $hasUtf8 = true;
-            }
-            $records[] = [
+            $encoding = mb_detect_encoding($name, ['ASCII', 'GBK', 'UTF-8']);
+            // if ('UTF-8' === $encoding) {
+            // $hasUtf8 = true;
+            // }
+            $record = [
                 $encoding,
                 $name,
                 $stats
             ];
+            // print_r($record);
+            $records[] = $record;
         }
+        // print_r($records);
+        // print_r(json_encode($hasUtf8));
+        // echo "\n";
         foreach ($records as $record) {
             list($encoding, $name, $stats) = $record;
-            if (!$hasUtf8 && 'CP936' == $encoding) {
-                $name = mb_convert_encoding($name, 'UTF-8', 'GBK');
+            // echo $this->isUtf8($name) . "\n";
+            if (!$this->isUtf8($name)) {
+                $name = mb_convert_encoding($name, 'UTF-8', $encoding);
             }
+            //if (!$hasUtf8 && 'CP936' == $encoding) {
+            //    $name = mb_convert_encoding($name, 'UTF-8', 'GBK');
+            //}
             call_user_func_array($callback, [
                 $name,
                 $stats
diff --git a/vendor/modstart/modstart/src/Repository/EloquentRepository.php b/vendor/modstart/modstart/src/Repository/EloquentRepository.php
@@ -236,6 +236,7 @@ public function get(\ModStart\Grid\Model $model)
         // var_dump($model->getQueries());exit();
         // var_dump($model->grid()->isDynamicModel());exit();
         $joins = $model->grid()->gridFilterJoins();
+        // var_dump($joins);
         if (!empty($joins)) {
             $methodMap = [
                 'left' => 'leftJoin',
@@ -250,6 +251,7 @@ public function get(\ModStart\Grid\Model $model)
         }
         // var_dump($model->getQueries());exit();
         $model->getQueries()->each(function ($value) use (&$query, $tableColumns) {
+            // print_r($value);
             if ($value['method'] == 'paginate') {
                 $value['arguments'][1] = $tableColumns;
             } elseif ($value['method'] == 'get') {
diff --git a/vendor/modstart/modstart/views/core/grid/index.blade.php b/vendor/modstart/modstart/views/core/grid/index.blade.php
@@ -130,6 +130,7 @@
             editDialogSize: {!! json_encode($editDialogSize) !!},
             showDialogSize: {!! json_encode($showDialogSize) !!},
             importDialogSize: {!! json_encode($importDialogSize) !!},
+            pageJumpEnable: {!! json_encode(boolval($pageJumpEnable)) !!},
             lang:{
                 loading: {!! json_encode(L('Loading')) !!},
                 noRecords: {!! json_encode(L('No Records')) !!},
@@ -142,10 +143,6 @@
                 confirmDeleteRecords: {!! json_encode(L('Confirm Delete %d records ?')) !!},
             },
         });
-
-
-
-
     })();
 </script>
 {!! $bodyAppend !!}

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ class AppConstant`
`6`	`6`	`{`
`7`	`7`	`const APP = 'blog';`
`8`	`8`	`const APP_NAME = 'ModStartBlog';`
`9`		`- const VERSION = '5.9.0';`
	`9`	`+ const VERSION = '6.0.0';`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-## 1.9.0`
	`1`	`+## 1.9.0 预览宝功能支持，升级逻辑优化`
`2`	`2`
`3`	`3`	`- 新增：模块市场预览包功能支持`
`4`	`4`	`- 新增：模块管理模块升级判断逻辑修改`
Original file line number	Diff line number	Diff line change
`@@ -204,6 +204,11 @@ function text_error($msg, $solutionUrl = null, $count = true)`
`204`	`204`	`echo '<div class="ub-alert ub-alert-danger">× ' . $msg . ' ' . ($solutionUrl ? '<a target="_blank" href="' . $solutionUrl . '">解决办法</a>' : '') . '</div>';`
`205`	`205`	`}`
`206`	`206`
	`207`	`+function text_warning($msg, $solutionUrl = null)`
	`208`	`+{`
	`209`	`+ echo '<div class="ub-alert ub-alert-warning">? ' . $msg . ' ' . ($solutionUrl ? '<a target="_blank" href="' . $solutionUrl . '">解决办法</a>' : '') . '</div>';`
	`210`	`+}`
	`211`	`+`
`207`	`212`	`function error_counter($inc = 1)`
`208`	`213`	`{`
`209`	`214`	`static $error = 0;`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,9 @@ private function request($gate, $param = [])`
`69`	`69`	`if ($this->debug) {`
`70`	`70`	`Log::debug('TecmzApi -> ' . $url . ' -> ' . json_encode($param, JSON_UNESCAPED_UNICODE));`
`71`	`71`	`}`
`72`		`- return CurlUtil::postJSONBody($url, $param);`
	`72`	`+ return CurlUtil::postJSONBody($url, $param, [`
	`73`	`+ 'timeout' => 60 * 10,`
	`74`	`+ ]);`
`73`	`75`	`}`
`74`	`76`
`75`	`77`