From 63a2dcbbee23332cf8b83d5f259d57e716bbefa1 Mon Sep 17 00:00:00 2001 From: From-wh Date: Mon, 24 Apr 2023 16:33:31 +0800 Subject: [PATCH 01/22] =?UTF-8?q?improve:=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/system/codeGeneration/components/TableForm.vue | 6 +++++- template/admin/src/pages/system/codeGeneration/list.vue | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/template/admin/src/pages/system/codeGeneration/components/TableForm.vue b/template/admin/src/pages/system/codeGeneration/components/TableForm.vue index 2d091e216..ed0099d04 100644 --- a/template/admin/src/pages/system/codeGeneration/components/TableForm.vue +++ b/template/admin/src/pages/system/codeGeneration/components/TableForm.vue @@ -17,7 +17,11 @@ diff --git a/template/admin/src/pages/system/codeGeneration/list.vue b/template/admin/src/pages/system/codeGeneration/list.vue index 9146aef39..87e35705e 100644 --- a/template/admin/src/pages/system/codeGeneration/list.vue +++ b/template/admin/src/pages/system/codeGeneration/list.vue @@ -1,7 +1,7 @@ @@ -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); } diff --git a/template/admin/src/layout/navBars/tagsView/tagsView.vue b/template/admin/src/layout/navBars/tagsView/tagsView.vue index ba45c569d..b2787ead7 100644 --- a/template/admin/src/layout/navBars/tagsView/tagsView.vue +++ b/template/admin/src/layout/navBars/tagsView/tagsView.vue @@ -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 { From dc79fbbf9a312fc3748692a3eb71a2547fae3bc8 Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Mon, 24 Apr 2023 17:25:48 +0800 Subject: [PATCH 12/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/adminapi/controller/v1/setting/SystemCrud.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php b/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php index 62b2a24f9..3b7107566 100644 --- a/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php +++ b/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php @@ -329,12 +329,13 @@ class SystemCrud extends AuthController $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; } - if ($filepath == $item) { + if ($filepath == $path) { $makeFilepath = $item; break; } From 4ae4cd2d89b3d559cb71607e89551a51e4454cde Mon Sep 17 00:00:00 2001 From: From-wh Date: Mon, 24 Apr 2023 18:44:27 +0800 Subject: [PATCH 13/22] =?UTF-8?q?improve:=20=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=8F=8A=E6=A0=87=E7=AD=BE=E5=A4=84=E7=90=86;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/src/layout/navBars/tagsView/tagsView.vue | 2 +- .../system/codeGeneration/components/TableForm.vue | 14 +++++++++----- .../src/pages/system/codeGeneration/index.vue | 5 ++--- template/admin/src/store/module/app.js | 14 ++++++++------ 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/template/admin/src/layout/navBars/tagsView/tagsView.vue b/template/admin/src/layout/navBars/tagsView/tagsView.vue index b2787ead7..97da63385 100644 --- a/template/admin/src/layout/navBars/tagsView/tagsView.vue +++ b/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; diff --git a/template/admin/src/pages/system/codeGeneration/components/TableForm.vue b/template/admin/src/pages/system/codeGeneration/components/TableForm.vue index ed0099d04..458afd03f 100644 --- a/template/admin/src/pages/system/codeGeneration/components/TableForm.vue +++ b/template/admin/src/pages/system/codeGeneration/components/TableForm.vue @@ -49,7 +49,7 @@ @@ -100,8 +100,7 @@ export default { }, }, id: { - type: String, - default: '', + type: String | Number, }, }, data() { @@ -231,7 +230,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('请输入列表名'); } } diff --git a/template/admin/src/pages/system/codeGeneration/index.vue b/template/admin/src/pages/system/codeGeneration/index.vue index 56ea9b117..5e6858047 100644 --- a/template/admin/src/pages/system/codeGeneration/index.vue +++ b/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; diff --git a/template/admin/src/store/module/app.js b/template/admin/src/store/module/app.js index 89a44ad62..574347bd3 100644 --- a/template/admin/src/store/module/app.js +++ b/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]); } }, From 0e7fce950cd5e52d77c1b8b5263749abcb462006 Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Mon, 24 Apr 2023 18:55:56 +0800 Subject: [PATCH 14/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9crud=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/v1/setting/SystemCrud.php | 2 ++ .../services/system/SystemCrudServices.php | 23 +++++++++++++++---- crmeb/crmeb/services/crud/Controller.php | 2 +- crmeb/crmeb/services/crud/Dao.php | 2 +- crmeb/crmeb/services/crud/Model.php | 2 +- crmeb/crmeb/services/crud/Service.php | 17 ++++++++------ crmeb/crmeb/services/crud/ViewPages.php | 6 ++++- ...rudController.stub => crudController.stub} | 0 .../stubs/dao/{CrudDao.stub => crudDao.stub} | 0 .../model/{CrudModel.stub => crudModel.stub} | 0 ...{CrudListIndex.stub => crudListIndex.stub} | 0 .../service/{CrudSave.stub => crudSave.stub} | 0 .../{CrudService.stub => crudService.stub} | 0 .../{CrudUpdate.stub => crudUpdate.stub} | 0 .../{GetCrudForm.stub => getCrudForm.stub} | 0 15 files changed, 38 insertions(+), 16 deletions(-) rename crmeb/crmeb/services/crud/stubs/controller/{CrudController.stub => crudController.stub} (100%) rename crmeb/crmeb/services/crud/stubs/dao/{CrudDao.stub => crudDao.stub} (100%) rename crmeb/crmeb/services/crud/stubs/model/{CrudModel.stub => crudModel.stub} (100%) rename crmeb/crmeb/services/crud/stubs/service/{CrudListIndex.stub => crudListIndex.stub} (100%) rename crmeb/crmeb/services/crud/stubs/service/{CrudSave.stub => crudSave.stub} (100%) rename crmeb/crmeb/services/crud/stubs/service/{CrudService.stub => crudService.stub} (100%) rename crmeb/crmeb/services/crud/stubs/service/{CrudUpdate.stub => crudUpdate.stub} (100%) rename crmeb/crmeb/services/crud/stubs/service/{GetCrudForm.stub => getCrudForm.stub} (100%) diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php b/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php index 3b7107566..9b6a9e527 100644 --- a/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php +++ b/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php @@ -254,6 +254,7 @@ 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; } @@ -303,6 +304,7 @@ class SystemCrud extends AuthController if ($deleteInfo) { array_push($info['field']['tableField'], $deleteInfo); } + $info['field']['pid'] = (int)$info['field']['pid']; return app('json')->success(['file' => $data, 'crudInfo' => $info]); } diff --git a/crmeb/app/services/system/SystemCrudServices.php b/crmeb/app/services/system/SystemCrudServices.php index 566349fd0..2d3daea82 100644 --- a/crmeb/app/services/system/SystemCrudServices.php +++ b/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', @@ -545,9 +549,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) { - 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); @@ -556,9 +567,8 @@ class SystemCrudServices extends BaseServices if ($crudInfo->menu_ids) { app()->make(SystemMenusServices::class)->deleteMenus($crudInfo->menu_ids); } - $menuInfo = (object)['id' => $crudInfo->menu_id]; } else { - $menuInfo = app()->make(SystemMenusServices::class)->save($dataMenu); + $menuInfo = $meunService->save($dataMenu); } //写入路由权限 $cateId = app()->make(SystemRouteServices::class)->topCateId('adminapi', 'CRUD'); @@ -655,6 +665,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), ]; @@ -667,6 +678,8 @@ class SystemCrudServices extends BaseServices $res = $this->dao->save($crudDate); } +// throw new ValidateException('测试中'); + return $res; }); diff --git a/crmeb/crmeb/services/crud/Controller.php b/crmeb/crmeb/services/crud/Controller.php index bf4098d4f..7724c69b4 100644 --- a/crmeb/crmeb/services/crud/Controller.php +++ b/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; diff --git a/crmeb/crmeb/services/crud/Dao.php b/crmeb/crmeb/services/crud/Dao.php index f6c0b570e..2cc5bda26 100644 --- a/crmeb/crmeb/services/crud/Dao.php +++ b/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'; } } diff --git a/crmeb/crmeb/services/crud/Model.php b/crmeb/crmeb/services/crud/Model.php index 547831b5e..d68aa4510 100644 --- a/crmeb/crmeb/services/crud/Model.php +++ b/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'; } } diff --git a/crmeb/crmeb/services/crud/Service.php b/crmeb/crmeb/services/crud/Service.php index 4b7961d91..49b547c57 100644 --- a/crmeb/crmeb/services/crud/Service.php +++ b/crmeb/crmeb/services/crud/Service.php @@ -73,10 +73,13 @@ 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 = "''"; + if (in_array($item['type'], ['checkbox'])) { + $valueContent = '[]'; + } + $from[] = $this->tab(2) . '$rule[] = FormBuilder::' . $item['type'] . '("' . $item['field'] . '", "' . $item['name'] . '", $info["' . $item['field'] . '"] ?? ' . $valueContent . ')' . $this->getOptionContent(in_array($item['type'], ['radio', 'select']), $item['option'] ?? []) . ';'; break; } - } if ($from) { $this->value['use-php'] .= "\n" . 'use crmeb\services\FormBuilder;'; @@ -214,11 +217,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; diff --git a/crmeb/crmeb/services/crud/ViewPages.php b/crmeb/crmeb/services/crud/ViewPages.php index 47448561d..56f089a66 100644 --- a/crmeb/crmeb/services/crud/ViewPages.php +++ b/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']; diff --git a/crmeb/crmeb/services/crud/stubs/controller/CrudController.stub b/crmeb/crmeb/services/crud/stubs/controller/crudController.stub similarity index 100% rename from crmeb/crmeb/services/crud/stubs/controller/CrudController.stub rename to crmeb/crmeb/services/crud/stubs/controller/crudController.stub diff --git a/crmeb/crmeb/services/crud/stubs/dao/CrudDao.stub b/crmeb/crmeb/services/crud/stubs/dao/crudDao.stub similarity index 100% rename from crmeb/crmeb/services/crud/stubs/dao/CrudDao.stub rename to crmeb/crmeb/services/crud/stubs/dao/crudDao.stub diff --git a/crmeb/crmeb/services/crud/stubs/model/CrudModel.stub b/crmeb/crmeb/services/crud/stubs/model/crudModel.stub similarity index 100% rename from crmeb/crmeb/services/crud/stubs/model/CrudModel.stub rename to crmeb/crmeb/services/crud/stubs/model/crudModel.stub diff --git a/crmeb/crmeb/services/crud/stubs/service/CrudListIndex.stub b/crmeb/crmeb/services/crud/stubs/service/crudListIndex.stub similarity index 100% rename from crmeb/crmeb/services/crud/stubs/service/CrudListIndex.stub rename to crmeb/crmeb/services/crud/stubs/service/crudListIndex.stub diff --git a/crmeb/crmeb/services/crud/stubs/service/CrudSave.stub b/crmeb/crmeb/services/crud/stubs/service/crudSave.stub similarity index 100% rename from crmeb/crmeb/services/crud/stubs/service/CrudSave.stub rename to crmeb/crmeb/services/crud/stubs/service/crudSave.stub diff --git a/crmeb/crmeb/services/crud/stubs/service/CrudService.stub b/crmeb/crmeb/services/crud/stubs/service/crudService.stub similarity index 100% rename from crmeb/crmeb/services/crud/stubs/service/CrudService.stub rename to crmeb/crmeb/services/crud/stubs/service/crudService.stub diff --git a/crmeb/crmeb/services/crud/stubs/service/CrudUpdate.stub b/crmeb/crmeb/services/crud/stubs/service/crudUpdate.stub similarity index 100% rename from crmeb/crmeb/services/crud/stubs/service/CrudUpdate.stub rename to crmeb/crmeb/services/crud/stubs/service/crudUpdate.stub diff --git a/crmeb/crmeb/services/crud/stubs/service/GetCrudForm.stub b/crmeb/crmeb/services/crud/stubs/service/getCrudForm.stub similarity index 100% rename from crmeb/crmeb/services/crud/stubs/service/GetCrudForm.stub rename to crmeb/crmeb/services/crud/stubs/service/getCrudForm.stub From 796330982215ef0943be2c9dbe7715fcd99d7baa Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Mon, 24 Apr 2023 19:08:08 +0800 Subject: [PATCH 15/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9checkbox=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/crmeb/services/crud/Service.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/crmeb/crmeb/services/crud/Service.php b/crmeb/crmeb/services/crud/Service.php index 49b547c57..2035056d9 100644 --- a/crmeb/crmeb/services/crud/Service.php +++ b/crmeb/crmeb/services/crud/Service.php @@ -74,10 +74,14 @@ class Service extends Make break; default: $valueContent = "''"; + $input = '$info["' . $item['field'] . '"] ?? '; if (in_array($item['type'], ['checkbox'])) { $valueContent = '[]'; + $input = '(array)(' . $input . $valueContent . ')'; + } else { + $input = $input . $valueContent; } - $from[] = $this->tab(2) . '$rule[] = FormBuilder::' . $item['type'] . '("' . $item['field'] . '", "' . $item['name'] . '", $info["' . $item['field'] . '"] ?? ' . $valueContent . ')' . $this->getOptionContent(in_array($item['type'], ['radio', 'select']), $item['option'] ?? []) . ';'; + $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; } } From c8fcac91b0a2b71948b9086f79d41624eef6e051 Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Mon, 24 Apr 2023 19:24:42 +0800 Subject: [PATCH 16/22] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=A1=A8=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/system/SystemCrudServices.php | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/crmeb/app/services/system/SystemCrudServices.php b/crmeb/app/services/system/SystemCrudServices.php index 2d3daea82..92ec665be 100644 --- a/crmeb/app/services/system/SystemCrudServices.php +++ b/crmeb/app/services/system/SystemCrudServices.php @@ -368,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 @@ -470,10 +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; + $modelName = !empty($data['modelName']) ? $data['modelName'] : $tableName; + $tableComment = !empty($data['tableComment']) ? $data['tableComment'] : $modelName; //检测是否为系统表 if (in_array($tableName, self::NOT_CRUD_TABANAME)) { @@ -484,6 +501,7 @@ class SystemCrudServices extends BaseServices $tableInfo = null; if ($id) { + $this->updateFromCommon($tableName, $tableComment); //删除数据库表 $tableInfo = $this->getTableInfo($tableName); if ($tableInfo) { From 2ae341ff24b8bf3754d824c81cc7a7cc197ae8b9 Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Mon, 24 Apr 2023 19:27:53 +0800 Subject: [PATCH 17/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/crmeb/services/crud/Service.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crmeb/crmeb/services/crud/Service.php b/crmeb/crmeb/services/crud/Service.php index 2035056d9..a9585685f 100644 --- a/crmeb/crmeb/services/crud/Service.php +++ b/crmeb/crmeb/services/crud/Service.php @@ -78,6 +78,9 @@ class Service extends Make 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 0d81c35f8e7db0d7a73b070a49d60dfe5097f76b Mon Sep 17 00:00:00 2001 From: From-wh Date: Tue, 25 Apr 2023 09:00:43 +0800 Subject: [PATCH 18/22] =?UTF-8?q?improve:=20=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=AD=97=E6=AE=B5=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/system/codeGeneration/components/TableForm.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/template/admin/src/pages/system/codeGeneration/components/TableForm.vue b/template/admin/src/pages/system/codeGeneration/components/TableForm.vue index 458afd03f..a505292a3 100644 --- a/template/admin/src/pages/system/codeGeneration/components/TableForm.vue +++ b/template/admin/src/pages/system/codeGeneration/components/TableForm.vue @@ -175,6 +175,7 @@ export default { tableField: [], optionsList: [], index: 0, + deleteField: [], }; }, created() { From 31e8185fa76582f083acd3be353143008efc6285 Mon Sep 17 00:00:00 2001 From: From-wh Date: Tue, 25 Apr 2023 09:15:17 +0800 Subject: [PATCH 19/22] =?UTF-8?q?improve:=20=E4=BC=98=E5=8C=96=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/layout/navBars/breadcrumb/setings.vue | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/template/admin/src/layout/navBars/breadcrumb/setings.vue b/template/admin/src/layout/navBars/breadcrumb/setings.vue index 8fffc1d52..fab1c77c6 100644 --- a/template/admin/src/layout/navBars/breadcrumb/setings.vue +++ b/template/admin/src/layout/navBars/breadcrumb/setings.vue @@ -196,10 +196,15 @@ -
+
{{ $t('message.layout.fourIsTagsviewIcon') }}
- +
{{ $t('message.layout.fiveTitle') }} -
+
{{ $t('message.layout.fiveTagsStyle') }}
- + 卡片 灵动 圆滑 From c0fb8da78c7f88548274970cae5ef3e6bfac7bab Mon Sep 17 00:00:00 2001 From: From-wh Date: Tue, 25 Apr 2023 09:29:10 +0800 Subject: [PATCH 20/22] =?UTF-8?q?fix:=20=E6=96=87=E4=BB=B6=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/pages/system/maintain/systemFile/opendir.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/admin/src/pages/system/maintain/systemFile/opendir.vue b/template/admin/src/pages/system/maintain/systemFile/opendir.vue index 2f277379f..240e720a6 100644 --- a/template/admin/src/pages/system/maintain/systemFile/opendir.vue +++ b/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) From b966afa6e00d489b1cadf2a6330c8900a5d9f9d2 Mon Sep 17 00:00:00 2001 From: From-wh Date: Tue, 25 Apr 2023 09:29:37 +0800 Subject: [PATCH 21/22] =?UTF-8?q?style:=20=E8=AE=BE=E7=BD=AE=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/layout/navBars/breadcrumb/user.vue | 1 + template/admin/src/theme/variables.scss | 1 + 2 files changed, 2 insertions(+) diff --git a/template/admin/src/layout/navBars/breadcrumb/user.vue b/template/admin/src/layout/navBars/breadcrumb/user.vue index 132c1c6a7..97b5b0707 100644 --- a/template/admin/src/layout/navBars/breadcrumb/user.vue +++ b/template/admin/src/layout/navBars/breadcrumb/user.vue @@ -271,6 +271,7 @@ export default { } & ::v-deep .el-dropdown { color: var(--prev-bg-topBarColor); + cursor: pointer; } & ::v-deep .el-badge { height: 40px; diff --git a/template/admin/src/theme/variables.scss b/template/admin/src/theme/variables.scss index 2e9e595ec..aa05e716c 100644 --- a/template/admin/src/theme/variables.scss +++ b/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); From 19a401fc63e184496f4a63c59349a0c73887bee6 Mon Sep 17 00:00:00 2001 From: From-wh Date: Tue, 25 Apr 2023 09:40:41 +0800 Subject: [PATCH 22/22] =?UTF-8?q?style:=20=E9=BB=98=E8=AE=A4=E4=B8=BB?= =?UTF-8?q?=E9=A2=98=E6=A0=87=E7=AD=BE=E9=A2=9C=E8=89=B2=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/layout/navBars/breadcrumb/setings.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/template/admin/src/layout/navBars/breadcrumb/setings.vue b/template/admin/src/layout/navBars/breadcrumb/setings.vue index fab1c77c6..f830eacbf 100644 --- a/template/admin/src/layout/navBars/breadcrumb/setings.vue +++ b/template/admin/src/layout/navBars/breadcrumb/setings.vue @@ -425,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'; @@ -434,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'; @@ -444,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'; }