From 293905417d07b72be9c574d47e697f1d7ccb0491 Mon Sep 17 00:00:00 2001 From: liufee Date: Mon, 14 Oct 2019 23:14:19 +0800 Subject: [PATCH] publish 2.0.8 --- README.md | 6 ++++-- backend/web/static/js/feehi.js | 4 ++-- backend/widgets/ActiveField.php | 4 ++-- common/config/main.php | 2 +- console/controllers/FileController.php | 4 +--- frontend/views/layouts/main.php | 1 + 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index bd879c8f..21af049f 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,11 @@ FeehiCMS没有对yii2做任何的修改、封装，但是把yii2的一些优秀 更新记录 ------- -2.0.7 增加后台多图上传;增加文章分类和文章及单页html模版选择;优化前台一些html标签; +2.0.8 增加更多restful示例;后台crud生成适应联合联合主键;优化编辑后页面跳转;优化安装锁定;前台增加葡萄牙语 -2.0.6 后台管理适配手机;增加后台代码注释操作运行命令自动生成权限;优化代码; +2.0.7 增加后台多图上传;增加文章分类和文章及单页html模版选择;优化前台一些html标签 + +2.0.6 后台管理适配手机;增加后台代码注释操作运行命令自动生成权限;优化代码 2.0.5 优化gii生成后台curd;增加列表页搜索框区域;增加form表单laydate、chosenSelect;修复其他bug diff --git a/backend/web/static/js/feehi.js b/backend/web/static/js/feehi.js index 0c186af7..a7ca7511 100644 --- a/backend/web/static/js/feehi.js +++ b/backend/web/static/js/feehi.js @@ -257,7 +257,7 @@ $(document).ready(function(){ type: this.getAttribute('dateType'), range: this.getAttribute('range') === 'true' ? true : ( this.getAttribute('range') === 'false' ? false : this.getAttribute('range') ), format: this.getAttribute('format'), - value: this.getAttribute('value') === 'new Date()' ? new Date() : this.getAttribute('value'), + value: this.getAttribute('val') === 'new Date()' ? new Date() : this.getAttribute('val'), isInitValue: this.getAttribute('isInitValue') != 'false', min: this.getAttribute('min'), max: this.getAttribute('max'), @@ -283,7 +283,7 @@ $(document).ready(function(){ },100) } } - delete config['value']; + delete config['val']; laydate.render(config); }); diff --git a/backend/widgets/ActiveField.php b/backend/widgets/ActiveField.php index de5be07b..36e41a90 100644 --- a/backend/widgets/ActiveField.php +++ b/backend/widgets/ActiveField.php @@ -353,7 +353,7 @@ public function ueditor($options = []) * 时间/日期输入框 * * @param array $options - * + * - val: string 值，替代html的value属性，设置此val会在页面加载完成后由js把value改为val，此处与laydate不同之处，需要注意 * - type: string，输入框类型，默认date。可选值： year 年选择器 只提供年列表选择 month 年月选择器 只提供年、月选择 @@ -373,7 +373,7 @@ public function date($options=[]) $options['range'] === true && $options['range'] = '~'; $options['range'] === false && $options['range'] = 'false'; !isset($options['format']) && $options['format'] = 'yyyy-MM-dd HH:mm:ss'; - !isset($options['value']) && $options['value'] = $this->model->{$this->attribute} ? $this->model->{$this->attribute} : ( strpos(get_class($this->model), 'Search' ) !== false ? '' : 'new Date()' ); + !isset($options['val']) && $options['val'] = $this->model->{$this->attribute} ? $this->model->{$this->attribute} : ( strpos(get_class($this->model), 'Search' ) !== false ? '' : 'new Date()' ); !isset($options['isInitValue']) && $options['isInitValue'] = false; $options['isInitValue'] === true && $options['isInitValue'] = 'true'; $options['isInitValue'] === false && $options['isInitValue'] = 'false'; diff --git a/common/config/main.php b/common/config/main.php index 2eeb8944..f368a9d8 100644 --- a/common/config/main.php +++ b/common/config/main.php @@ -1,7 +1,7 @@ 'Feehi CMS', - 'version' => '2.0.7.1', + 'version' => '2.0.8', 'vendorPath' => dirname(dirname(__DIR__)) . '/vendor', 'aliases' => [ '@bower' => '@vendor/bower-asset', diff --git a/console/controllers/FileController.php b/console/controllers/FileController.php index fbfd54d7..cddce241 100644 --- a/console/controllers/FileController.php +++ b/console/controllers/FileController.php @@ -112,7 +112,6 @@ public function actionPublish() $temp . 'frontend' . DIRECTORY_SEPARATOR . 'web' . DIRECTORY_SEPARATOR . 'uploads', $temp . 'frontend' . DIRECTORY_SEPARATOR . 'web' . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR . 'assets', $temp . 'frontend' . DIRECTORY_SEPARATOR . 'web' . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR . 'uploads', - $temp . 'common' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR .'conf', $temp . 'api' . DIRECTORY_SEPARATOR . 'runtime', ]; FileHelper::copyDirectory($origin, $publishDir); @@ -123,8 +122,7 @@ public function actionPublish() } FileHelper::removeDirectory($publishDir . DIRECTORY_SEPARATOR . '.git'); FileHelper::removeDirectory($publishDir . DIRECTORY_SEPARATOR . '.idea'); - FileHelper::createDirectory($publishDir . DIRECTORY_SEPARATOR . 'common' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR .'conf', 0777); - if( file_exists($publishDir . DIRECTORY_SEPARATOR . 'common' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR .'conf' . DIRECTORY_SEPARATOR . 'install.lock') ) unlink($publishDir . DIRECTORY_SEPARATOR . 'common' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR .'conf' . DIRECTORY_SEPARATOR . 'install.lock'); + if( file_exists($publishDir . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . 'install.lock') ) unlink($publishDir . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . 'install.lock'); file_put_contents($temp . 'common' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'main-local.php', "" ); //passthru("composer archive --dir=$publishDir --format=zip"); $this->stdout('Copy Success' . "\n", Console::FG_GREEN); diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index f3a5d3c5..610ad842 100644 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -133,6 +133,7 @@

feehi->website_icp?> Powered by Feehi CMS 飞嗨