Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

crmeb/app/adminapi/controller/v1/setting/SystemCrud.php

@@ -254,6 +254,8 @@ class SystemCrud extends AuthController
             $item['default_field_type'] = $item['field_type'];
             $item['default_comment'] = $item['comment'];
             $item['default_default'] = $item['default'];
+            $item['is_table'] = !!$item['is_table'];
+            $item['primaryKey'] = isset($item['primaryKey']) ? (int)$item['primaryKey'] : 0;
             $info['field']['tableField'][$key] = $item;
         }
         //对比数据库,是否有新增字段
@@ -282,9 +284,27 @@ class SystemCrud extends AuthController
         }
 
         if ($newColumn) {
-            $info['field']['tableField'] = array_merge($info['field']['tableField'], $newColumn);
+            $info['field']['tableField'] = array_merge($newColumn, $info['field']['tableField']);
         }
-
+        $keyInfo = [];
+        $deleteInfo = [];
+        foreach ($info['field']['tableField'] as $key => $item) {
+            if ($item['primaryKey']) {
+                $keyInfo = $item;
+                unset($info['field']['tableField'][$key]);
+            }
+            if ($item['field_type'] == 'addSoftDelete') {
+                $deleteInfo = $item;
+                unset($info['field']['tableField'][$key]);
+            }
+        }
+        if ($keyInfo) {
+            array_unshift($info['field']['tableField'], $keyInfo);
+        }
+        if ($deleteInfo) {
+            array_push($info['field']['tableField'], $deleteInfo);
+        }
+        $info['field']['pid'] = (int)$info['field']['pid'];
         return app('json')->success(['file' => $data, 'crudInfo' => $info]);
     }
 
@@ -308,19 +328,24 @@ class SystemCrud extends AuthController
         if (!$crudInfo) {
             return app('json')->fail('修改的CRUD文件不存在');
         }
-        $makePath = [];
+
+        $makeFilepath = '';
         foreach ($crudInfo->make_path as $key => $item) {
+            $path = $item;
             if (in_array($key, ['pages', 'router', 'api'])) {
                 $item = Make::adminTemplatePath() . $item;
             } else {
                 $item = app()->getRootPath() . $item;
             }
-            $makePath[$key] = $item;
+            if ($filepath == $path) {
+                $makeFilepath = $item;
+                break;
+            }
         }
-        if (!in_array($filepath, $makePath)) {
+        if (!$makeFilepath || !in_array($filepath, $crudInfo->make_path)) {
             return app('json')->fail('您没有权限修改此文件');
         }
-        $res = $service->savefile($filepath, $comment);
+        $res = $service->savefile($makeFilepath, $comment);
         if ($res) {
             return app('json')->success(100000);
         } else {

crmeb/app/services/system/SystemCrudServices.php

@@ -165,9 +165,13 @@ class SystemCrudServices extends BaseServices
                     'value' => 'dateTime',
                     'label' => '单选日期时间',
                 ],
+//                [
+//                    'value' => 'dateTimeRange',
+//                    'label' => '日期时间区间选择',
+//                ],
                 [
-                    'value' => 'dateTimeRange',
-                    'label' => '日期时间区间选择',
+                    'value' => 'checkbox',
+                    'label' => '多选框',
                 ],
                 [
                     'value' => 'radio',
@@ -303,7 +307,47 @@ class SystemCrudServices extends BaseServices
         $changeFiled = addslashes($changeFiled);
         $type = addslashes($type);
         $default = addslashes($default);
-        $sql = "ALTER TABLE `$tableName` CHANGE `$field` `$changeFiled` $type($limit) NOT NULL DEFAULT '$default' COMMENT '$comment';";
+        if (in_array(strtolower($type), ['text', 'longtext', 'tinytext'])) {
+            $sql = "ALTER TABLE `$tableName` CHANGE `$field` `$changeFiled` $type CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '$comment';";
+        } else {
+            $sql = "ALTER TABLE `$tableName` CHANGE `$field` `$changeFiled` $type($limit) NOT NULL DEFAULT '$default' COMMENT '$comment';";
+        }
+        return Db::execute($sql);
+    }
+
+    /**
+     * 添加字段
+     * @param string $tableName
+     * @param string $field
+     * @param string $prevFiled
+     * @param string $type
+     * @param string $limit
+     * @param string $default
+     * @param string $comment
+     * @param array $options
+     * @return mixed
+     * @author 等风来
+     * @email 136327134@qq.com
+     * @date 2023/4/24
+     */
+    public function addAlter(string $tableName, string $field, string $prevFiled, string $type, $limit = '', string $default = '', string $comment = '', array $options = [])
+    {
+        $tableName = $this->getTableName($tableName);
+        $comment = addslashes($comment);
+        $field = addslashes($field);
+        $prevFiled = addslashes($prevFiled);
+        $type = addslashes($type);
+        $default = addslashes($default);
+        if ($prevFiled) {
+            $after = "AFTER `$prevFiled`";
+        } else {
+            $after = "";
+        }
+        if (in_array(strtolower($type), ['text', 'longtext', 'tinytext'])) {
+            $sql = "ALTER TABLE `$tableName` ADD `$field` $type NULL COMMENT '$comment' $after;";
+        } else {
+            $sql = "ALTER TABLE `$tableName` ADD `$field` $type($limit) NOT NULL DEFAULT '$default' COMMENT '$comment' $after;";
+        }
         return Db::execute($sql);
     }
 
@@ -324,6 +368,23 @@ class SystemCrudServices extends BaseServices
         return Db::execute($sql);
     }
 
+    /**
+     * 修改表备注
+     * @param string $tableName
+     * @param string $common
+     * @return mixed
+     * @author 等风来
+     * @email 136327134@qq.com
+     * @date 2023/4/24
+     */
+    protected function updateFromCommon(string $tableName, string $common)
+    {
+        $tableName = $this->getTableName($tableName);
+        $common = addslashes($common);
+        $sql = "ALTER TABLE `$tableName` COMMENT = '$common';";
+        return Db::execute($sql);
+    }
+
     /**
      * 对比字段变动了更改
      * @param string $tableName
@@ -336,28 +397,57 @@ class SystemCrudServices extends BaseServices
     protected function diffAlter(string $tableName, array $deleteField, array $tableField)
     {
         $updateAlter = [];
+        $addAlter = [];
+
+        $columns = $this->getColumnNamesList($tableName);
+        $fieldAll = array_column($columns, 'name');
+        $prevFiled = $columns[count($columns) - 1]['name'] ?? '';
         //对比数据库字段
         foreach ($tableField as $item) {
             if ($item['primaryKey']) {
                 continue;
             }
 
+            //前台新增的字段进行添加
             if (!(isset($item['default_field']) &&
                 isset($item['default_field_type']) &&
                 isset($item['default_limit']) &&
                 isset($item['default_comment']) &&
                 isset($item['default_default']))
             ) {
+                if (!in_array($item['field'], $fieldAll)) {
+                    $addAlter[] = [
+                        'prev_filed' => $prevFiled,
+                        'field' => $item['field'],
+                        'limit' => $item['limit'],
+                        'type' => $item['field_type'],
+                        'comment' => $item['comment'],
+                        'default' => $item['default'],
+                    ];
+                }
                 continue;
+            } else {
+                //默认字段没有在数据库中,需要添加字段
+                if (!in_array($item['default_field'], $fieldAll)) {
+                    $addAlter[] = [
+                        'prev_filed' => $prevFiled,
+                        'field' => $item['field'],
+                        'limit' => $item['limit'],
+                        'type' => $item['field_type'],
+                        'comment' => $item['comment'],
+                        'default' => $item['default'],
+                    ];
+                    continue;
+                }
             }
 
             if ($item['default_field'] != $item['field'] && in_array($item['field_type'], ['addTimestamps', 'addSoftDelete'])) {
-                throw new AdminException('伪删除字段不允许被更改');
+                throw new AdminException($item['field'] . '字段不允许被更改');
             }
 
-
+            //数据库表存在的,字段,并且被修改
             if ($item['default_field'] != $item['field'] ||
-                $item['default_field_type'] != $item['type'] ||
+                $item['default_field_type'] != $item['field_type'] ||
                 $item['default_limit'] != $item['limit'] ||
                 $item['default_comment'] != $item['comment'] ||
                 $item['default_default'] != $item['default']) {
@@ -375,6 +465,10 @@ class SystemCrudServices extends BaseServices
         foreach ($updateAlter as $item) {
             $this->updateAlter($tableName, $item['default_field'], $item['field'], $item['type'], $item['limit'], $item['default'], $item['comment']);
         }
+        //添加字段
+        foreach ($addAlter as $item) {
+            $this->addAlter($tableName, $item['field'], $item['prev_filed'], $item['type'], $item['limit'], $item['default'], $item['comment']);
+        }
         //删除多余字段
         foreach ($deleteField as $item) {
             $this->deleteAlter($tableName, $item);
@@ -393,14 +487,10 @@ class SystemCrudServices extends BaseServices
     public function createCrud(int $id, array $data)
     {
         $tableName = $data['tableName'];
-        $tableComment = $data['tableComment'] ?? $data['menuName'];
         $tableField = $this->valueReplace($data['tableField']);
         $filePath = $this->valueReplace($data['filePath']);
-        $modelName = $data['modelName'] ?? $data['menuName'] ?? $tableName;
-
-        if ($this->dao->value(['table_name' => $tableName])) {
-            throw new AdminException(500048);
-        }
+        $modelName = !empty($data['modelName']) ? $data['modelName'] : $tableName;
+        $tableComment = !empty($data['tableComment']) ? $data['tableComment'] : $modelName;
 
         //检测是否为系统表
         if (in_array($tableName, self::NOT_CRUD_TABANAME)) {
@@ -411,6 +501,7 @@ class SystemCrudServices extends BaseServices
 
         $tableInfo = null;
         if ($id) {
+            $this->updateFromCommon($tableName, $tableComment);
             //删除数据库表
             $tableInfo = $this->getTableInfo($tableName);
             if ($tableInfo) {
@@ -476,9 +567,16 @@ class SystemCrudServices extends BaseServices
 
         $res = $this->transaction(function () use ($crudInfo, $tableInfo, $modelName, $filePath, $tableName, $routeName, $data, $dataMenu) {
             $routeService = app()->make(SystemRouteServices::class);
+            $meunService = app()->make(SystemMenusServices::class);
             //修改菜单名称
             if ($crudInfo) {
-                $menuInfo = app()->make(SystemMenusServices::class)->update($crudInfo->menu_id, $dataMenu);
+                //菜单存在的时候进行修改
+                if ($crudInfo->menu_id && $meunService->value(['id' => [$crudInfo->menu_id]], 'id')) {
+                    $meunService->update($crudInfo->menu_id, $dataMenu);
+                    $menuInfo = (object)['id' => $crudInfo->menu_id];
+                } else {
+                    $menuInfo = $meunService->save($dataMenu);
+                }
                 //删除掉添加的路由权限
                 if ($crudInfo->routes_id) {
                     $routeService->deleteRoutes($crudInfo->routes_id);
@@ -488,7 +586,7 @@ class SystemCrudServices extends BaseServices
                     app()->make(SystemMenusServices::class)->deleteMenus($crudInfo->menu_ids);
                 }
             } else {
-                $menuInfo = app()->make(SystemMenusServices::class)->save($dataMenu);
+                $menuInfo = $meunService->save($dataMenu);
             }
             //写入路由权限
             $cateId = app()->make(SystemRouteServices::class)->topCateId('adminapi', 'CRUD');
@@ -557,7 +655,7 @@ class SystemCrudServices extends BaseServices
             $menuData = [];
             foreach ($ruleData as $item) {
                 $menuData[] = [
-                    'pid' => $menuInfo->id,
+                    'pid' => $menuInfo->id ?: 0,
                     'methods' => $item['method'],
                     'api_url' => $item['path'],
                     'unique_auth' => $item['unique_auth'],
@@ -566,6 +664,7 @@ class SystemCrudServices extends BaseServices
                     'auth_type' => 2,
                 ];
             }
+
             $menus = app()->make(SystemMenusServices::class)->saveAll($menuData);
             $menuIds = array_column($menus->toArray(), 'id');
             //生成文件
@@ -584,6 +683,7 @@ class SystemCrudServices extends BaseServices
                 'table_collation' => $tableInfo['TABLE_COLLATION'] ?? '',
                 'field' => json_encode($data),//提交的数据
                 'menu_ids' => json_encode($menuIds),//生成的菜单id
+                'menu_id' => $menuInfo->id,//生成的菜单id
                 'make_path' => json_encode($makePath),
                 'routes_id' => json_encode($routeIds),
             ];
@@ -596,6 +696,8 @@ class SystemCrudServices extends BaseServices
                 $res = $this->dao->save($crudDate);
             }
 
+//            throw new ValidateException('测试中');
+
             return $res;
         });
 
@@ -692,6 +794,10 @@ class SystemCrudServices extends BaseServices
                 $timestamps = true;
             } else {
                 $option['comment'] = $item['comment'];
+                $fieldType = $this->changeTabelRule($item['field_type']);
+                if (in_array($fieldType, ['text', 'longtext', 'tinytext'])) {
+                    unset($option['limit']);
+                }
                 $table->addColumn($item['field'], $this->changeTabelRule($item['field_type']), $option);
             }
         }

crmeb/crmeb/services/crud/Controller.php

@@ -124,7 +124,7 @@ class Controller extends Make
             'edit' => $controllerPath . 'edit.stub',
             'update' => $controllerPath . 'update.stub',
             'delete' => $controllerPath . 'delete.stub',
-            'controller' => $controllerPath . 'CrudController.stub',
+            'controller' => $controllerPath . 'crudController.stub',
         ];
 
         return $type ? $stubs[$type] : $stubs;

crmeb/crmeb/services/crud/Dao.php

@@ -44,6 +44,6 @@ class Dao extends Make
      */
     protected function getStub(string $type = '')
     {
-        return __DIR__ . DS . 'stubs' . DS . 'dao' . DS . 'CrudDao.stub';
+        return __DIR__ . DS . 'stubs' . DS . 'dao' . DS . 'crudDao.stub';
     }
 }

crmeb/crmeb/services/crud/Model.php

@@ -84,6 +84,6 @@ class Model extends Make
      */
     protected function getStub(string $type = '')
     {
-        return __DIR__ . DS . 'stubs' . DS . 'model' . DS . 'CrudModel.stub';
+        return __DIR__ . DS . 'stubs' . DS . 'model' . DS . 'crudModel.stub';
     }
 }

crmeb/crmeb/services/crud/Service.php

@@ -73,10 +73,20 @@ class Service extends Make
                         $from[] = $this->tab(2) . $this->getframeImagesPhpContent($item['field'], $item['name'], $item['required'] ?? false) . ';';
                         break;
                     default:
-                        $from[] = $this->tab(2) . '$rule[] = FormBuilder::' . $item['type'] . '("' . $item['field'] . '","' . $item['name'] . '",$info["' . $item['field'] . '"] ?? "")' . $this->getOptionContent(in_array($item['type'], ['radio', 'select']), $item['option'] ?? []) . ';';
+                        $valueContent = "''";
+                        $input = '$info["' . $item['field'] . '"] ?? ';
+                        if (in_array($item['type'], ['checkbox'])) {
+                            $valueContent = '[]';
+                            $input = '(array)(' . $input . $valueContent . ')';
+                        } else if ($item['type'] == 'radio') {
+                            $valueContent = '-1';
+                            $input = '(int)(' . $input . $valueContent . ')';
+                        } else {
+                            $input = $input . $valueContent;
+                        }
+                        $from[] = $this->tab(2) . '$rule[] = FormBuilder::' . $item['type'] . '("' . $item['field'] . '", "' . $item['name'] . '",  ' . $input . ')' . $this->getOptionContent(in_array($item['type'], ['radio', 'select', 'checkbox']), $item['option'] ?? []) . ';';
                         break;
                 }
-
             }
             if ($from) {
                 $this->value['use-php'] .= "\n" . 'use crmeb\services\FormBuilder;';
@@ -103,6 +113,7 @@ class Service extends Make
 
         $filePath = $this->getFilePathName($path, $this->value['nameCamel']);
         $this->usePath = $this->baseDir . '\\' . $this->value['nameCamel'];
+
         $this->setContent($contentStr);
         $this->setPathname($filePath);
         return $this;
@@ -117,7 +128,10 @@ class Service extends Make
      */
     protected function getOptionContent(bool $isOption, array $option = [])
     {
-        if (!$option && $isOption) {
+        if (!$isOption) {
+            return '';
+        }
+        if (!$option) {
             $option = [
                 ['value' => 1, 'label' => '开启'],
                 ['value' => 0, 'label' => '关闭']
@@ -127,11 +141,11 @@ class Service extends Make
         if ($option) {
             $attOption = [];
             foreach ($option as $item) {
-                $attOption[] = $this->tab(2) . "['value'=>'{$item['value']}', 'label'=>'{$item['label']}'],";
+                $attOption[] = $this->tab(3) . "['value'=>'{$item['value']}', 'label'=>'{$item['label']}'],";
             }
 
             $strOption = implode("\n", $attOption);
-            $php = '->options([' . $strOption . '])';
+            $php = "->options([\n" . $strOption . "\n" . $this->tab(2) . "])";
         }
 
         return $php;
@@ -210,11 +224,11 @@ CONTENT;
         $servicePath = __DIR__ . DS . 'stubs' . DS . 'service' . DS;
 
         $stubs = [
-            'index' => $servicePath . 'CrudListIndex.stub',
-            'form' => $servicePath . 'GetCrudForm.stub',
-            'save' => $servicePath . 'CrudSave.stub',
-            'update' => $servicePath . 'CrudUpdate.stub',
-            'services' => $servicePath . 'CrudService.stub',
+            'index' => $servicePath . 'crudListIndex.stub',
+            'form' => $servicePath . 'getCrudForm.stub',
+            'save' => $servicePath . 'crudSave.stub',
+            'update' => $servicePath . 'crudUpdate.stub',
+            'services' => $servicePath . 'crudService.stub',
         ];
 
         return $type ? $stubs[$type] : $stubs;

crmeb/crmeb/services/crud/ViewPages.php

@@ -74,19 +74,23 @@ class ViewPages extends Make
         $columnStr = [];
         $contentVue = [];
         foreach ($field as $key => $item) {
+            $keyName = 'key';
             if (isset($item['type'])) {
                 switch ($item['type']) {
                     case 'frameImageOne':
+                        $keyName = 'slot';
                         $templateContent = file_get_contents($this->getStub('image'));
                         $contentVue[] = str_replace(['{%field%}'], [$item['field']], $templateContent);
                         break;
                     case 'frameImages':
+                        $keyName = 'slot';
                         $templateContent = file_get_contents($this->getStub('images'));
                         $contentVue[] = str_replace(['{%field%}'], [$item['field']], $templateContent);
                         break;
                 }
             }
-            $columnStr[] = ($key == 0 ? $this->tab(2) : '') . "{\n" . $this->tab(3) . "title:\"{$item['name']}\"," . $this->tab(2) . "\n" . $this->tab(3) . "key:\"{$item['field']}\"\n" . $this->tab(2) . "}\n";
+
+            $columnStr[] = ($key == 0 ? $this->tab(2) : '') . "{\n" . $this->tab(3) . "title:\"{$item['name']}\"," . $this->tab(2) . "\n" . $this->tab(3) . "$keyName:\"{$item['field']}\"\n" . $this->tab(2) . "}\n";
         }
         $this->value['auth'] = Str::snake($name);
         $this->value['componentName'] = $this->value['auth'];

crmeb/public/admin/system_static/css/chunk-0d39ed33.6beb4ded.css

@@ -0,0 +1 @@
+.tableBox[data-v-35428d3a] .ivu-table-header table{border:none!important}.table-mark[data-v-35428d3a]{cursor:text}.table-mark[data-v-35428d3a]:hover{border:1px solid #c2c2c2;padding:3px 5px}.mark[data-v-35428d3a] .ivu-input{background:#fff;border-radius:.39rem}.ivu-input[data-v-35428d3a]:focus,.ivu-input[data-v-35428d3a]:hover,.mark[data-v-35428d3a] .ivu-input{border:transparent;-webkit-box-shadow:none;box-shadow:none}

crmeb/public/admin/system_static/css/chunk-6e9f76a0.71bb20f5.css

@@ -0,0 +1 @@
+.v-transfer-dom[data-v-306b6d59] .ivu-modal-content-drag{z-index:2!important}.radio[data-v-306b6d59]{margin-bottom:14px}.radio[data-v-306b6d59] .name{width:125px;text-align:right;padding-right:12px}.tabBox_img[data-v-68334b14]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-68334b14]{width:100%;height:100%}

template/admin/src/i18n/lang/zh-cn.js

@@ -73,7 +73,7 @@ export default {
     dropdown3: '404',
     dropdown4: '401',
     dropdown5: '退出登录',
-    dropdown6: '代码仓库',
+    dropdown6: '个人中心',
     searchPlaceholder: '菜单搜索：支持中文、路由路径',
     newTitle: '通知',
     newBtn: '全部已读',

template/admin/src/layout/component/columnsAside.vue

@@ -209,6 +209,8 @@ export default {
   height: 100%;
   background: var(--prev-bg-columnsMenuBar);
   box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
+  border-right: 1px solid var(--prev-border-color-lighter);
+
   ul {
     position: relative;
     li {

template/admin/src/layout/navBars/breadcrumb/index.vue

@@ -79,6 +79,6 @@ export default {
   padding-right: 15px;
   overflow: hidden;
   background: var(--prev-bg-topBar);
-  //   border-bottom: 1px solid var(--prev-border-color-lighter);
+  border-bottom: 1px solid var(--prev-border-color-lighter);
 }
 </style>

template/admin/src/layout/navBars/breadcrumb/setings.vue

@@ -199,7 +199,12 @@
         <div class="layout-breadcrumb-seting-bar-flex mt15">
           <div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsTagsviewIcon') }}</div>
           <div class="layout-breadcrumb-seting-bar-flex-value">
-            <el-switch v-model="getThemeConfig.isTagsviewIcon" :width="35" @change="setLocalThemeConfig"></el-switch>
+            <el-switch
+              v-model="getThemeConfig.isTagsviewIcon"
+              :disabled="!getThemeConfig.isTagsview"
+              :width="35"
+              @change="setLocalThemeConfig"
+            ></el-switch>
           </div>
         </div>
         <!-- <div class="layout-breadcrumb-seting-bar-flex mt15">
@@ -236,7 +241,7 @@
         <div class="layout-breadcrumb-seting-bar-flex mt15">
           <div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveTagsStyle') }}</div>
           <div class="layout-breadcrumb-seting-bar-flex-value">
-            <el-select
+            <!-- <el-select
               v-model="getThemeConfig.tagsStyle"
               placeholder="请选择"
               size="mini"
@@ -246,16 +251,26 @@
               <el-option label="风格1" value="tags-style-one"></el-option>
               <el-option label="风格2" value="tags-style-four"></el-option>
               <el-option label="风格3" value="tags-style-five"></el-option>
-            </el-select>
+            </el-select> -->
+            <el-radio-group
+              v-model="getThemeConfig.tagsStyle"
+              :disabled="!getThemeConfig.isTagsview"
+              size="mini"
+              @change="setLocalThemeConfig"
+            >
+              <el-radio-button label="tags-style-one">卡片</el-radio-button>
+              <el-radio-button label="tags-style-four">灵动</el-radio-button>
+              <el-radio-button label="tags-style-five">圆滑</el-radio-button>
+            </el-radio-group>
           </div>
         </div>
         <div class="layout-breadcrumb-seting-bar-flex mt15">
           <div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveAnimation') }}</div>
           <div class="layout-breadcrumb-seting-bar-flex-value">
             <el-radio-group v-model="getThemeConfig.animation" size="mini" @change="setLocalThemeConfig">
-              <el-radio-button label="slide-right">右滑</el-radio-button>
               <el-radio-button label="slide-left">左滑</el-radio-button>
               <el-radio-button label="opacitys">透明</el-radio-button>
+              <el-radio-button label="slide-right">右滑</el-radio-button>
             </el-radio-group>
           </div>
         </div>
@@ -410,7 +425,7 @@ export default {
           } else if (val == 'theme-3') {
             themeSelect['--prev-bg-menuBar'] = '#282c34';
             themeSelect['--prev-bg-menu-hover-ba-color'] = '#41b584';
-            themeSelect['--prev-color-primary'] = '#fff';
+            themeSelect['--prev-color-primary'] = '#41b584';
             themeSelect['--prev-bg-topBar'] = '#fff';
             themeSelect['--prev-bg-topBarColor'] = '#282c34';
             themeSelect['--prev-bg-menuBarColor'] = '#fff';
@@ -419,7 +434,7 @@ export default {
             themeSelect['--prev-bg-menuBar'] = '#282c34';
             themeSelect['--prev-bg-menu-hover-ba-color'] = '#6954f0';
             themeSelect['--prev-bg-topBarColor'] = '#282c34';
-            themeSelect['--prev-color-primary'] = '#fff';
+            themeSelect['--prev-color-primary'] = '#6954f0';
             themeSelect['--prev-bg-topBar'] = '#fff';
 
             themeSelect['--prev-bg-menuBarColor'] = '#fff';
@@ -429,7 +444,7 @@ export default {
             themeSelect['--prev-bg-topBar'] = '#fff';
             themeSelect['--prev-bg-topBarColor'] = '#282c34';
             themeSelect['--prev-bg-menu-hover-ba-color'] = '#f34d37';
-            themeSelect['--prev-color-primary'] = '#fff';
+            themeSelect['--prev-color-primary'] = '#f34d37';
             themeSelect['--prev-bg-menuBarColor'] = '#fff';
             themeSelect['--prev-MenuActiveColor'] = '#fff';
           }

template/admin/src/layout/navBars/breadcrumb/user.vue

@@ -26,9 +26,7 @@
     <div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">
       <i class="el-icon-search" :title="$t('message.user.title2')"></i>
     </div>
-    <div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">
-      <i class="el-icon-star-off" :title="$t('message.user.title3')"></i>
-    </div>
+
     <div class="layout-navbars-breadcrumb-user-icon">
       <el-popover
         placement="bottom"
@@ -58,14 +56,18 @@
         <i class="el-icon-arrow-down el-icon--right"></i>
       </span>
       <el-dropdown-menu slot="dropdown">
-        <el-dropdown-item :command="homePath">{{ $t('message.user.dropdown1') }}</el-dropdown-item>
-        <!-- <el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>
-        <el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>
-        <el-dropdown-item command="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item>
-        <el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</el-dropdown-item> -->
+        <!-- <el-dropdown-item :command="homePath">{{ $t('message.user.dropdown1') }}</el-dropdown-item> -->
+        <el-dropdown-item command="user">{{ $t('message.user.dropdown6') }}</el-dropdown-item>
+        <!-- <el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item> -->
+        <!-- <el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item> -->
+        <!-- <el-dropdown-item command="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item> -->
+        <!-- <el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</el-dropdown-item> -->
         <el-dropdown-item divided command="logOut">{{ $t('message.user.dropdown5') }}</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
+    <div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">
+      <i class="el-icon-setting" :title="$t('message.user.title3')"></i>
+    </div>
     <Search ref="searchRef" />
   </div>
 </template>
@@ -225,7 +227,8 @@ export default {
             })
             .catch(() => {});
         }, 150);
-      } else if (path === 'wareHouse') {
+      } else if (path === 'user') {
+        this.$router.push({ name: 'systemUser' });
       } else {
         this.$router.push(path);
       }
@@ -268,6 +271,7 @@ export default {
   }
   & ::v-deep .el-dropdown {
     color: var(--prev-bg-topBarColor);
+    cursor: pointer;
   }
   & ::v-deep .el-badge {
     height: 40px;

template/admin/src/layout/navBars/tagsView/tagsView.vue

@@ -62,7 +62,7 @@ export default {
     // 获取布局配置信息
     getThemeConfig() {
       return this.$store.state.themeConfig.themeConfig;
-    },
+    }, 
     // 动态设置 tagsView 风格样式
     setTagsStyle() {
       return this.$store.state.themeConfig.themeConfig.tagsStyle;
@@ -252,8 +252,7 @@ export default {
           this.closeCurrentTagsView(path);
           break;
         case 2:
-          this.$router.push({ path, query: currentTag.query });
-          this.closeOtherTagsView(path);
+          this.closeOtherTagsView(path, currentTag.query);
           break;
         case 3:
           this.closeAllTagsView(path);
@@ -284,20 +283,22 @@ export default {
       //   this.addBrowserSetSession(this.tagNavList);
     },
     // 3、关闭其它 tagsView：如果是设置了固定的（isAffix），不进行关闭
-    closeOtherTagsView(path) {
+    closeOtherTagsView(path, query) {
       let tagsViewList = [];
       this.tagsViewRoutesList.map((v) => {
-        if (v.meta.isAffix && !v.meta.isHide) tagsViewList.push({ ...v });
-        if ((v.path = path)) tagsViewList.push({ ...v });
+        if ((v.meta && v.meta.isAffix) || v.path === path) tagsViewList.push({ ...v });
       });
+      console.log(tagsViewList, this.tagsViewRoutesList, path);
       this.addBrowserSetSession(tagsViewList);
+      this.$router.push({ path, query });
+
       // this.addTagsView(path);
     },
     // 4、关闭全部 tagsView：如果是设置了固定的（isAffix），不进行关闭
     closeAllTagsView(path) {
       let tagsViewList = [];
       this.tagsViewRoutesList.map((v) => {
-        if (v.meta.isAffix && !v.meta.isHide) {
+        if (v.meta.isAffix) {
           tagsViewList.push({ ...v });
           if (tagsViewList.some((v) => v.path === path)) this.$router.push({ path, query: this.$route.query });
           else this.$router.push({ path: v.path, query: this.$route.query });
@@ -326,6 +327,9 @@ export default {
 </script>
 
 <style scoped lang="scss">
+/deep/ .el-scrollbar__bar.is-horizontal {
+  height: 0;
+}
 .layout-navbars-tagsview {
   flex: 1;
   background-color: var(--prev-bg-white);
@@ -370,9 +374,9 @@ export default {
         background: var(--prev-tag-active-color);
         z-index: -1;
         opacity: 0;
-        transform: scale3d(0.7, 1, 1);
-        transition: transform 0.3s, opacity 0.3s;
-        transition-timing-function: cubic-bezier(0.2, 1, 0.3, 1);
+        // transform: scale3d(0.7, 1, 1);
+        // transition: transform 0.3s, opacity 0.3s;
+        // transition-timing-function: cubic-bezier(0.2, 1, 0.3, 1);
       }
       &:hover {
         color: var(--prev-color-primary-light-9);
@@ -444,6 +448,7 @@ export default {
       border: none !important;
       position: relative;
       border-radius: 3px !important;
+
       .layout-icon-active {
         display: none;
       }

template/admin/src/pages/setting/systemMenus/index.vue

@@ -45,6 +45,11 @@
       >
         <vxe-table-column field="id" title="ID" tooltip min-width="70"></vxe-table-column>
         <vxe-table-column field="menu_name" tree-node title="按钮名称" min-width="200"></vxe-table-column>
+        <vxe-table-column field="icon" title="图标" min-width="200" align="center">
+          <template v-slot="{ row }">
+            <Icon class="icon" :type="row.icon" />
+          </template>
+        </vxe-table-column>
         <vxe-table-column field="api_url" title="接口路径" min-width="150">
           <template v-slot="{ row }">
             <span>{{ row.methods ? '[' + row.methods + ']  ' + row.api_url : row.api_url }}</span>
@@ -452,6 +457,9 @@ export default {
   > .vxe-table--header-wrapper {
     background: #fff !important;
   }
+  .icon {
+    font-size: 20px;
+  }
 }
 
 .rule {

template/admin/src/pages/system/codeGeneration/components/TableForm.vue

@@ -17,7 +17,11 @@
           <Input :disabled="disabledInput(index)" v-model="tableField[index].field"></Input>
         </template>
         <template slot-scope="{ row, index }" slot="field_type">
-          <Select v-model="tableField[index].field_type" @on-change="changeItemField($event, index)">
+          <Select
+            v-model="tableField[index].field_type"
+            :disabled="disabledInput(index)"
+            @on-change="changeItemField($event, index)"
+          >
             <Option v-for="item in columnTypeList" :value="item" :key="item">{{ item }}</Option>
           </Select>
         </template>
@@ -45,7 +49,7 @@
           </Select>
         </template>
         <template slot-scope="{ row, index }" slot="options">
-          <div class="table-options" v-if="['select', 'radio'].includes(tableField[index].from_type)">
+          <div class="table-options" v-if="['select', 'radio', 'checkbox'].includes(tableField[index].from_type)">
             <Select>
               <Option v-for="item in tableField[index].options" :value="item.value" :key="item.value">{{
                 item.label
@@ -56,7 +60,7 @@
           <div v-else>--</div>
         </template>
         <template slot-scope="{ row, index }" slot="action">
-          <a v-if="!foundation.isTable" @click="del(row, index)">删除</a>
+          <a v-if="!foundation.primaryKey" @click="del(row, index)">删除</a>
           <span v-else>--</span>
         </template>
       </Table>
@@ -96,8 +100,7 @@ export default {
       },
     },
     id: {
-      type: String,
-      default: '',
+      type: String | Number,
     },
   },
   data() {
@@ -172,6 +175,7 @@ export default {
       tableField: [],
       optionsList: [],
       index: 0,
+      deleteField: [],
     };
   },
   created() {
@@ -227,7 +231,12 @@ export default {
         if ((!el.field || !el.field_type) && !['addTimestamps', 'addSoftDelete'].includes(el.field_type)) {
           return this.$Message.warning('请先完善上一条数据');
         }
-        if (el.is_table && !el.table_name && !['addTimestamps', 'addSoftDelete'].includes(el.field_type)) {
+        if (
+          el.is_table &&
+          !el.table_name &&
+          !Number(el.primaryKey) &&
+          !['addTimestamps', 'addSoftDelete'].includes(el.field_type)
+        ) {
           return this.$Message.warning('请输入列表名');
         }
       }

template/admin/src/pages/system/codeGeneration/index.vue

@@ -89,7 +89,7 @@ export default {
       tableField: [],
       rowList: [],
       reqloading: false,
-      id: "",
+      id: '',
     };
   },
   created() {
@@ -102,9 +102,8 @@ export default {
   methods: {
     getDetail(id) {
       crudDet(id).then((res) => {
-        console.log(res);
         let data = res.data.crudInfo.field;
-        this.formItem.foundation.pid = data.pid;
+        this.formItem.foundation.pid = Number(data.pid);
         this.formItem.foundation.tableName = data.tableName;
         this.formItem.foundation.modelName = data.modelName;
         this.formItem.foundation.menuName = data.menuName;

template/admin/src/pages/system/codeGeneration/list.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <Card :bordered="false" dis-hover class="ivu-mt">
-      <Button type="primary" @click="groupAdd()" class="mr20">代码生成</Button>
+      <Button type="primary" @click="groupAdd()" class="mr20">添加功能</Button>
       <!-- <Button type="success" @click="buildCode()" class="mr20">重新发布</Button> -->
       <Table
         :columns="columns1"
@@ -92,9 +92,9 @@
                 :icon="value.icon"
               >
                 <div
-                  :ref="'container_' + value.index"
+                  ref="container"
                   :id="'container_' + value.index"
-                  style="height: 100%; min-height: 560px"
+                  style="height: 100%; min-height: calc(100vh - 110px)"
                 ></div>
               </TabPane>
             </Tabs>
@@ -571,7 +571,6 @@ export default {
 
   .ivu-tabs-tabpane {
     min-height: 560px;
-    height: 73vh;
     margin-top: -1px;
   }
 }
@@ -612,4 +611,7 @@ export default {
     z-index: 99;
   }
 }
+.file-box {
+  height: 100%;
+}
 </style>

template/admin/src/pages/system/maintain/systemFile/opendir.vue

@@ -801,7 +801,7 @@ export default {
     isEditBlur(row) {
       row.is_edit = false;
       let data = {
-        full_path: '/app',
+        full_path: row.real_path,
         mark: row.mark,
       };
       markSave(this.fileToken, data)

template/admin/src/store/module/app.js

@@ -77,13 +77,15 @@ export default {
     },
     addTag(state, { route, type = 'unshift' }) {
       let router = getRouteTitleHandled(route);
-      console.log(router, 'routerrouterrouter');
+      let i = state.tagNavList.findIndex((item) => item.path === route.path);
+
       if (!routeHasExist(state.tagNavList, router)) {
-        if (type === 'push') state.tagNavList.push(router);
-        else {
-          if (router.name === homeName) state.tagNavList.unshift(router);
-          else state.tagNavList.splice(1, 0, router);
-        }
+        if (type === 'push')
+          if (i < 1) state.tagNavList.push(router);
+          else {
+            if (router.name === homeName) state.tagNavList.unshift(router);
+            else state.tagNavList.splice(1, 0, router);
+          }
         setTagNavListInLocalstorage([...state.tagNavList]);
       }
     },

template/admin/src/theme/variables.scss

@@ -956,6 +956,7 @@ $positions: 'top', 'right', 'bottom', 'left';
   height: 50px;
   display: flex;
   align-items: center;
+  font-weight: 500;
   margin-bottom: 0 !important;
   border-bottom: 1px solid var(--prev-border-color-lighter);
   color: var(--prev-color-text-primary);