diff --git a/orange-demo-activiti/orange-demo-activiti-web/src/assets/style/element-variables.scss b/orange-demo-activiti/orange-demo-activiti-web/src/assets/style/element-variables.scss index f75588ca..45ba475d 100644 --- a/orange-demo-activiti/orange-demo-activiti-web/src/assets/style/element-variables.scss +++ b/orange-demo-activiti/orange-demo-activiti-web/src/assets/style/element-variables.scss @@ -1,5 +1,5 @@ -// @import "../element-variables-light.scss"; -@import "../element-variables-dark.scss"; +@import "../element-variables-light.scss"; +// @import "../element-variables-dark.scss"; // @import "../element-variables-green.scss"; // @import "../element-variables-orange.scss"; // @import "../element-variables-blue.scss"; \ No newline at end of file diff --git a/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/dropdown.css b/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/dropdown.css index efe9d7ab..74aecbef 100644 --- a/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/dropdown.css +++ b/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/dropdown.css @@ -1398,8 +1398,8 @@ cursor: pointer; outline: none; } .el-dropdown-menu__item:not(.is-disabled):hover, .el-dropdown-menu__item:focus { - background-color: #409EFF; - color: #FFFFFF; } + background-color: #ecf5ff; + color: #66b1ff; } .el-dropdown-menu__item i { margin-right: 5px; } .el-dropdown-menu__item--divided { diff --git a/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/index.css b/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/index.css index b34f94c4..d9dac33d 100644 --- a/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/index.css +++ b/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/index.css @@ -8039,8 +8039,8 @@ cursor: pointer; outline: none; } .el-dropdown-menu__item:not(.is-disabled):hover, .el-dropdown-menu__item:focus { - background-color: #409EFF; - color: #FFFFFF; } + background-color: #ecf5ff; + color: #66b1ff; } .el-dropdown-menu__item i { margin-right: 5px; } .el-dropdown-menu__item--divided { @@ -8583,7 +8583,7 @@ position: relative; margin: 0; padding-left: 0; - background-color: #272C34; } + background-color: #FFFFFF; } .el-menu::before, .el-menu::after { display: table; @@ -8700,7 +8700,7 @@ height: 56px; line-height: 56px; font-size: 14px; - color: #FFFFFF; + color: #303133; padding: 0 20px; list-style: none; cursor: pointer; @@ -8716,7 +8716,7 @@ color: #909399; } .el-menu-item:hover, .el-menu-item:focus { outline: none; - background-color: #409EFF; } + background-color: #ecf5ff; } .el-menu-item.is-disabled { opacity: 0.25; cursor: not-allowed; @@ -8740,7 +8740,7 @@ height: 56px; line-height: 56px; font-size: 14px; - color: #FFFFFF; + color: #303133; padding: 0 20px; list-style: none; cursor: pointer; @@ -8756,13 +8756,13 @@ color: #909399; } .el-submenu__title:hover, .el-submenu__title:focus { outline: none; - background-color: #409EFF; } + background-color: #ecf5ff; } .el-submenu__title.is-disabled { opacity: 0.25; cursor: not-allowed; background: none !important; } .el-submenu__title:hover { - background-color: #409EFF; } + background-color: #ecf5ff; } .el-submenu .el-menu { border: none; } .el-submenu .el-menu-item { @@ -19440,8 +19440,8 @@ cursor: pointer; font-size: 14px; } .el-table-filter__list-item:hover { - background-color: #409EFF; - color: #FFFFFF; } + background-color: #ecf5ff; + color: #66b1ff; } .el-table-filter__list-item.is-active { background-color: #409EFF; color: #FFFFFF; } diff --git a/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/menu.css b/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/menu.css index 07fe584e..f43f172f 100644 --- a/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/menu.css +++ b/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/menu.css @@ -490,7 +490,7 @@ position: relative; margin: 0; padding-left: 0; - background-color: #272C34; } + background-color: #FFFFFF; } .el-menu::before, .el-menu::after { display: table; @@ -607,7 +607,7 @@ height: 56px; line-height: 56px; font-size: 14px; - color: #FFFFFF; + color: #303133; padding: 0 20px; list-style: none; cursor: pointer; @@ -623,7 +623,7 @@ color: #909399; } .el-menu-item:hover, .el-menu-item:focus { outline: none; - background-color: #409EFF; } + background-color: #ecf5ff; } .el-menu-item.is-disabled { opacity: 0.25; cursor: not-allowed; @@ -647,7 +647,7 @@ height: 56px; line-height: 56px; font-size: 14px; - color: #FFFFFF; + color: #303133; padding: 0 20px; list-style: none; cursor: pointer; @@ -663,13 +663,13 @@ color: #909399; } .el-submenu__title:hover, .el-submenu__title:focus { outline: none; - background-color: #409EFF; } + background-color: #ecf5ff; } .el-submenu__title.is-disabled { opacity: 0.25; cursor: not-allowed; background: none !important; } .el-submenu__title:hover { - background-color: #409EFF; } + background-color: #ecf5ff; } .el-submenu .el-menu { border: none; } .el-submenu .el-menu-item { diff --git a/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/table-column.css b/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/table-column.css index d1d98ede..de08606c 100644 --- a/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/table-column.css +++ b/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/table-column.css @@ -1373,8 +1373,8 @@ cursor: pointer; font-size: 14px; } .el-table-filter__list-item:hover { - background-color: #409EFF; - color: #FFFFFF; } + background-color: #ecf5ff; + color: #66b1ff; } .el-table-filter__list-item.is-active { background-color: #409EFF; color: #FFFFFF; } diff --git a/orange-demo-activiti/orange-demo-activiti-web/src/staticDict/flowStaticDict.js b/orange-demo-activiti/orange-demo-activiti-web/src/staticDict/flowStaticDict.js index 8472e8c6..6d5635fe 100644 --- a/orange-demo-activiti/orange-demo-activiti-web/src/staticDict/flowStaticDict.js +++ b/orange-demo-activiti/orange-demo-activiti-web/src/staticDict/flowStaticDict.js @@ -101,6 +101,11 @@ const SysFlowTaskOperationType = new DictionaryBase('任务操作类型', [ id: 'multi_abstain', name: '弃权(会签)', symbol: 'MULTI_ABSTAIN' + }, + { + id: 'set_assignee', + name: '指定审批人', + symbol: 'SET_ASSIGNEE' } ]); Vue.prototype.SysFlowTaskOperationType = SysFlowTaskOperationType; diff --git a/orange-demo-activiti/orange-demo-activiti-web/src/views/onlineForm/components/customUpload.vue b/orange-demo-activiti/orange-demo-activiti-web/src/views/onlineForm/components/customUpload.vue index c72b1687..9cc5184f 100644 --- a/orange-demo-activiti/orange-demo-activiti-web/src/views/onlineForm/components/customUpload.vue +++ b/orange-demo-activiti/orange-demo-activiti-web/src/views/onlineForm/components/customUpload.vue @@ -35,12 +35,15 @@