Browse Source

优化addtion

优化blockquote字体大小
Karson 3 years ago
parent
commit
03bfe24893

+ 1 - 1
application/common.php

@@ -250,7 +250,7 @@ if (!function_exists('addtion')) {
                 $model = $v['name'] ? \think\Db::name($v['name']) : \think\Db::table($v['table']);
             }
             $primary = $v['primary'] ? $v['primary'] : $model->getPk();
-            $result[$v['field']] = isset($ids[$v['field']]) ? $model->where($primary, 'in', $ids[$v['field']])->column("{$primary},{$v['column']}") : [];
+            $result[$v['field']] = isset($ids[$v['field']]) ? $model->where($primary, 'in', $ids[$v['field']])->column($v['column'], $primary) : [];
         }
 
         foreach ($items as $k => &$v) {

+ 2 - 2
application/config.php

@@ -277,7 +277,7 @@ return [
         'multiplenav'           => false,
         //是否开启多选项卡(仅在开启多级菜单时起作用)
         'multipletab'           => true,
-        //后台皮肤,为空时表示使用skin-black-green
+        //后台皮肤,为空时表示使用skin-black-blue
         'adminskin'             => '',
         //后台是否启用面包屑
         'breadcrumb'            => false,
@@ -292,7 +292,7 @@ return [
         //允许跨域的域名,多个以,分隔
         'cors_request_domain'   => 'localhost,127.0.0.1',
         //版本号
-        'version'               => '1.2.2.20211011_beta',
+        'version'               => '1.3.0.20220101',
         //API接口地址
         'api_url'               => 'https://api.fastadmin.net',
     ],

+ 1 - 1
public/assets/less/bootstrap-less/variables.less

@@ -849,7 +849,7 @@
 //** Blockquote small color
 @blockquote-small-color: @gray-light;
 //** Blockquote font size
-@blockquote-font-size: (@font-size-base * 1.25);
+@blockquote-font-size: ceil(@font-size-base * 1.05);
 //** Blockquote border color
 @blockquote-border-color: @gray-lighter;
 //** Page header border color