BJ_ZTEITS-Developers / parking-cloud-yudao

Commit de4df784eaaeab4228a782fbab5a1adb7ad62f10

Authored by YunaiV
1 parent b1d42bec

v3.4.0 操作按钮组调整为朴素按钮样式

Inline Side-by-side
Showing 16 changed files with 31 additions and 33 deletions
yudao-ui-admin/src/views/bpm/model/index.vue
  View file @de4df78
... ... @@ -17,7 +17,7 @@
17 17 </el-select>
18 18 </el-form-item>
19 19 <el-form-item>
20   - <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
  20 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
21 21 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
22 22 </el-form-item>
23 23 </el-form>
... ... @@ -25,7 +25,7 @@
25 25 <!-- 操作工具栏 -->
26 26 <el-row :gutter="10" class="mb8">
27 27 <el-col :span="1.5">
28   - <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
  28 + <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
29 29 v-hasPermi="['bpm:model:create']">新建流程</el-button>
30 30 </el-col>
31 31 <el-col :span="1.5">
... ...
yudao-ui-admin/src/views/bpm/oa/leave/index.vue
  View file @de4df78
... ... @@ -30,7 +30,8 @@
30 30 <!-- 操作工具栏 -->
31 31 <el-row :gutter="10" class="mb8">
32 32 <el-col :span="1.5">
33   - <el-button type="primary" icon="el-icon-plus" size="mini" v-hasPermi="['bpm:oa-leave:create']" @click="handleAdd">发起请假</el-button>
  33 + <el-button type="primary" plain icon="el-icon-plus" size="mini"
  34 + v-hasPermi="['bpm:oa-leave:create']" @click="handleAdd">发起请假</el-button>
34 35 </el-col>
35 36 <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
36 37 </el-row>
... ...
yudao-ui-admin/src/views/infra/config/index.vue
  View file @de4df78
... ... @@ -32,20 +32,15 @@
32 32 ></el-date-picker>
33 33 </el-form-item>
34 34 <el-form-item>
35   - <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
  35 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
36 36 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
37 37 </el-form-item>
38 38 </el-form>
39 39  
40 40 <el-row :gutter="10" class="mb8">
41 41 <el-col :span="1.5">
42   - <el-button
43   - type="primary"
44   - icon="el-icon-plus"
45   - size="mini"
46   - @click="handleAdd"
47   - v-hasPermi="['infra:config:create']"
48   - >新增</el-button>
  42 + <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
  43 + v-hasPermi="['infra:config:create']">新增</el-button>
49 44 </el-col>
50 45 <el-col :span="1.5">
51 46 <el-button
... ...
yudao-ui-admin/src/views/infra/job/index.vue
  View file @de4df78
... ... @@ -14,14 +14,14 @@
14 14 <el-input v-model="queryParams.handlerName" placeholder="请输入处理器的名字" clearable size="small" @keyup.enter.native="handleQuery"/>
15 15 </el-form-item>
16 16 <el-form-item>
17   - <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
  17 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
18 18 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
19 19 </el-form-item>
20 20 </el-form>
21 21  
22 22 <el-row :gutter="10" class="mb8">
23 23 <el-col :span="1.5">
24   - <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
  24 + <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
25 25 v-hasPermi="['infra:job:create']">新增</el-button>
26 26 </el-col>
27 27 <el-col :span="1.5">
... ...
yudao-ui-admin/src/views/system/dept/index.vue
  View file @de4df78
... ... @@ -10,14 +10,14 @@
10 10 </el-select>
11 11 </el-form-item>
12 12 <el-form-item>
13   - <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
  13 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
14 14 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
15 15 </el-form-item>
16 16 </el-form>
17 17  
18 18 <el-row :gutter="10" class="mb8">
19 19 <el-col :span="1.5">
20   - <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:dept:create']">新增</el-button>
  20 + <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:dept:create']">新增</el-button>
21 21 </el-col>
22 22 <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
23 23 </el-row>
... ...
yudao-ui-admin/src/views/system/dict/data.vue
  View file @de4df78
... ... @@ -15,14 +15,14 @@
15 15 </el-select>
16 16 </el-form-item>
17 17 <el-form-item>
18   - <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
  18 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
19 19 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
20 20 </el-form-item>
21 21 </el-form>
22 22  
23 23 <el-row :gutter="10" class="mb8">
24 24 <el-col :span="1.5">
25   - <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
  25 + <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
26 26 v-hasPermi="['system:dict:create']">新增</el-button>
27 27 </el-col>
28 28 <el-col :span="1.5">
... ...
yudao-ui-admin/src/views/system/dict/index.vue
  View file @de4df78
... ... @@ -17,14 +17,14 @@
17 17 range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
18 18 </el-form-item>
19 19 <el-form-item>
20   - <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
  20 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
21 21 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
22 22 </el-form-item>
23 23 </el-form>
24 24  
25 25 <el-row :gutter="10" class="mb8">
26 26 <el-col :span="1.5">
27   - <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
  27 + <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
28 28 v-hasPermi="['system:dict:create']">新增</el-button>
29 29 </el-col>
30 30 <el-col :span="1.5">
... ...
yudao-ui-admin/src/views/system/loginlog/index.vue
  View file @de4df78
... ... @@ -20,7 +20,7 @@
20 20 type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
21 21 </el-form-item>
22 22 <el-form-item>
23   - <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
  23 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
24 24 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
25 25 </el-form-item>
26 26 </el-form>
... ...
yudao-ui-admin/src/views/system/menu/index.vue
  View file @de4df78
... ... @@ -10,14 +10,14 @@
10 10 </el-select>
11 11 </el-form-item>
12 12 <el-form-item>
13   - <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
  13 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
14 14 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
15 15 </el-form-item>
16 16 </el-form>
17 17  
18 18 <el-row :gutter="10" class="mb8">
19 19 <el-col :span="1.5">
20   - <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
  20 + <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
21 21 v-hasPermi="['system:menu:create']">新增</el-button>
22 22 </el-col>
23 23 <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
... ...
yudao-ui-admin/src/views/system/notice/index.vue
  View file @de4df78
... ... @@ -13,14 +13,15 @@
13 13 </el-select>
14 14 </el-form-item>
15 15 <el-form-item>
16   - <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
  16 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
17 17 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
18 18 </el-form-item>
19 19 </el-form>
20 20  
21 21 <el-row :gutter="10" class="mb8">
22 22 <el-col :span="1.5">
23   - <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:notice:create']"s>新增</el-button>
  23 + <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
  24 + v-hasPermi="['system:notice:create']"s>新增</el-button>
24 25 </el-col>
25 26 <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
26 27 </el-row>
... ...
yudao-ui-admin/src/views/system/operatelog/index.vue
  View file @de4df78
... ... @@ -26,7 +26,7 @@
26 26 type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
27 27 </el-form-item>
28 28 <el-form-item>
29   - <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
  29 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
30 30 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
31 31 </el-form-item>
32 32 </el-form>
... ...
yudao-ui-admin/src/views/system/post/index.vue
  View file @de4df78
... ... @@ -13,14 +13,14 @@
13 13 </el-select>
14 14 </el-form-item>
15 15 <el-form-item>
16   - <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
  16 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
17 17 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
18 18 </el-form-item>
19 19 </el-form>
20 20  
21 21 <el-row :gutter="10" class="mb8">
22 22 <el-col :span="1.5">
23   - <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
  23 + <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
24 24 v-hasPermi="['system:post:create']">新增</el-button>
25 25 </el-col>
26 26 <el-col :span="1.5">
... ...
yudao-ui-admin/src/views/system/role/index.vue
  View file @de4df78
... ... @@ -19,14 +19,14 @@
19 19 range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
20 20 </el-form-item>
21 21 <el-form-item>
22   - <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
  22 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
23 23 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
24 24 </el-form-item>
25 25 </el-form>
26 26  
27 27 <el-row :gutter="10" class="mb8">
28 28 <el-col :span="1.5">
29   - <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
  29 + <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
30 30 v-hasPermi="['system:role:create']">新增</el-button>
31 31 </el-col>
32 32 <el-col :span="1.5">
... ...
yudao-ui-admin/src/views/system/session/index.vue
  View file @de4df78
... ... @@ -8,7 +8,7 @@
8 8 <el-input v-model="queryParams.username" placeholder="请输入用户名称" clearable size="small" @keyup.enter.native="handleQuery"/>
9 9 </el-form-item>
10 10 <el-form-item>
11   - <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
  11 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
12 12 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
13 13 </el-form-item>
14 14  
... ...
yudao-ui-admin/src/views/system/user/index.vue
  View file @de4df78
... ... @@ -32,14 +32,14 @@
32 32 range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
33 33 </el-form-item>
34 34 <el-form-item>
35   - <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
  35 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
36 36 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
37 37 </el-form-item>
38 38 </el-form>
39 39  
40 40 <el-row :gutter="10" class="mb8">
41 41 <el-col :span="1.5">
42   - <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
  42 + <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
43 43 v-hasPermi="['system:user:create']">新增</el-button>
44 44 </el-col>
45 45 <el-col :span="1.5">
... ...
更新日志.md
  View file @de4df78
... ... @@ -39,7 +39,8 @@ TODO
39 39 * 【修复】修复文件访问地址错误 [#68](https://github.com/YunaiV/ruoyi-vue-pro/pull/68)
40 40 * 【修复】工作流程发起以及审批异常，由 `@NotEmpty` 校验、和 Long 类型异常导致 [#73](https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/73)
41 41 * 【修复】自定义 DefaultStreamMessageListenerContainerX 实现，解决 Redisson Stream 读取不到数据返回 `null` 导致 NPE 问题 [commit](https://gitee.com/zhijiantianya/ruoyi-vue-pro/commit/2cef84bdc836de9041b5c68dcba0f0e59f666277)
42   -* 【修复】部门更新后，本地缓存不刷新的问题 [#pr](https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/77)
  42 +* 【修复】部门更新后，本地缓存不刷新的问题 [#77](https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/77)
  43 +* 【修复】获取拥有指定的角色用户时，返回错误的 id 编号 [#79](https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/79)
43 44  
44 45 ### 🔨 Dependency Upgrades
45 46  
... ...