样式调整

hookehuyr
Commit cb88b4bac08ee9f6a77c5eb9bcee309dbfa6f2a6 cb88b4ba 1 parent 0b73c3c6
Showing 4 changed files with 65 additions and 12 deletions
doc/App.vue
doc/selectUserView.vue
src/assets/logo.png
src/editor/vue-flow-editor-menu.tsx
--- a/doc/App.vue
View file @cb88b4b
+++ b/doc/App.vue
View file @cb88b4b
@@ -43,7 +43,7 @@
         <vue-flow-edit-menu-group label="操作节点" value>
           <!-- 注意 key 值的绑定 -->
           <vue-flow-edit-menu
-            v-for="(value, key) in state.controlConfig"
+            v-for="(value, key) in state.controlList"
             :key="key"
             :model="{ control: key, text: value.text, desc: value.desc }"
           >
@@ -137,7 +137,7 @@
                       <el-col :span="6">可编辑</el-col>
                     </el-row>
                     <el-row v-if="!state.search_auth_value" style="width: 100%; padding-left: 10px;">
-                      <el-col :span="12" style="color: #409eff;">全选</el-col>
+                      <el-col :span="12" style="color: #009688">全选</el-col>
                       <el-col :span="6" style="padding-left: 5px;"
                         ><el-checkbox
                           @change="onAuthAllChange"
@@ -220,7 +220,7 @@
                   </div>
                 </div>
                 <div v-else class="more-attr-set">
-                  <el-button @click="onConfirmMoreAttr(state.more_attr_data)" type="primary" style="width: 100%;">完成</el-button>
+                  <el-button @click="onConfirmMoreAttr(state.more_attr_data)" type="primary" color="#009688" style="width: 100%;">完成</el-button>
                   <div class="more-attr-switch">
                     <div class="more-attr-title">{{ state.more_attr_data.label }}</div>
                     <div><el-switch v-model="state.more_attr_data.show" /></div>
@@ -304,7 +304,7 @@
       <!-- 表单底部按钮 -->
       <template v-slot:foot>
         <div v-if="state.main_attr_set" style="width: 100%; text-align: center;">
-          <el-button type="primary" @click="saveForm" style="width: 40%;">保存</el-button>
+          <el-button type="primary" color="#009688" @click="saveForm" style="width: 40%;">保存</el-button>
           <el-button @click="cancel" style="width: 40%;">关闭</el-button>
         </div>
       </template>
@@ -432,32 +432,46 @@ export default {
       //     img: "https://cdn.ipadbiz.cn/oa/crowd-node.svg"
       //   }
       // },
+      controlList: {
+        flow: {
+          text: '流程节点',
+          desc: '流程节点',
+          color: '#ed8383',
+          img: 'https://cdn.ipadbiz.cn/oa/flow/icons-flow.png',
+        },
+        cc: {
+          text: '抄送节点',
+          desc: '抄送节点',
+          color: '#ed8383',
+          img: 'https://cdn.ipadbiz.cn/oa/flow/icon-cc.png',
+        },
+      },
       controlConfig: {
         start: {
           id: 'start-node',
           text: '开始',
           desc: '开始',
           color: '#9283ed',
-          img: 'https://cdn.ipadbiz.cn/oa/advertisement-node.svg',
+          img: 'https://cdn.ipadbiz.cn/oa/flow/icon-start.png',
         },
         flow: {
           text: '流程节点',
           desc: '流程节点',
           color: '#ed8383',
-          img: 'https://cdn.ipadbiz.cn/oa/coupon-node.svg',
+          img: 'https://cdn.ipadbiz.cn/oa/flow/icons-flow.png',
         },
         cc: {
           text: '抄送节点',
           desc: '抄送节点',
           color: '#ed8383',
-          img: 'https://cdn.ipadbiz.cn/oa/coupon-node.svg',
+          img: 'https://cdn.ipadbiz.cn/oa/flow/icon-cc.png',
         },
         end: {
           id: 'end-node',
           text: '结束',
           desc: '结束',
           color: '#92dba8',
-          img: 'https://cdn.ipadbiz.cn/oa/crowd-node.svg',
+          img: 'https://cdn.ipadbiz.cn/oa/flow/icon-end.png',
         },
       },
       search_auth_value: '',
@@ -1296,7 +1310,7 @@ body {
       .right {
       } */
       .active {
-        color: #409eff;
+        color: #009688;
       }
     }
     .content:hover .btn-action {
@@ -1335,4 +1349,22 @@ body {
     font-size: 14px;
   }
 }
+
+.el-tabs__item.is-active, .el-radio-button__inner:hover {
+  color: #009688 !important;
+}
+.el-tabs__active-bar, .el-radio-button__original-radio:checked+.el-radio-button__inner {
+  background-color: #009688!important;
+}
+.el-tag {
+  background-color: #009688!important;
+  color: white !important;
+}
+.el-tag .el-tag__close, .el-radio-button__original-radio:checked+.el-radio-button__inner:hover {
+  color: white !important;
+}
+.el-checkbox__input.is-checked .el-checkbox__inner, .el-switch.is-checked .el-switch__core {
+  background-color: #009688!important;
+  border-color: #009688!important;
+}
 </style>
--- a/doc/selectUserView.vue
View file @cb88b4b
+++ b/doc/selectUserView.vue
View file @cb88b4b
 <!--
  * @Date: 2023-11-01 10:18:53
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2023-11-22 15:46:03
+ * @LastEditTime: 2023-11-22 16:51:48
  * @FilePath: /vue-flow-editor/doc/selectUserView.vue
  * @Description: 成员列表选择控件
 -->
@@ -349,7 +349,12 @@ watch(() => {
     dialogUserFormVisible.value = true;
   } else {
     dialogUserFormVisible.value = false;
+    // 用户选择弹框关闭时，清空数据
     is_active_search.value = false;
+    userTabType.value = "corp-tree";
+    activeTabId.value = "tab-corp";
+    activeTabIdx.value = 0;
+    tabOffset.value = 0;
   }
 });
@@ -851,6 +856,7 @@ const onSearchInput = (val) => {
   .el-input-group__append {
     width: 100px !important;
     padding: 0 !important;
+    box-shadow: none!important;
   }
   .search-group {
     display: flex;
@@ -871,4 +877,12 @@ const onSearchInput = (val) => {
     }
   }
 }
+
+.el-tag {
+  background-color: #009688!important;
+  color: white !important;
+}
+.el-tag .el-tag__close {
+  color: white !important;
+}
 </style>
--- a/src/assets/logo.png 0 → 100644
View file @cb88b4b
+++ b/src/assets/logo.png 0 → 100644
View file @cb88b4b
--- a/src/editor/vue-flow-editor-menu.tsx
View file @cb88b4b
+++ b/src/editor/vue-flow-editor-menu.tsx
View file @cb88b4b
+/*
+ * @Date: 2023-10-27 09:29:59
+ * @LastEditors: hookehuyr hookehuyr@gmail.com
+ * @LastEditTime: 2023-11-22 16:16:48
+ * @FilePath: /vue-flow-editor/src/editor/vue-flow-editor-menu.tsx
+ * @Description: 文件描述
+ */
 import {computed, inject} from "vue";
 import {VueFlowEditorProvider} from "@/editor/editor";
 import {suffixSize} from "@/utils/utils";
-const logo = require('../assets/vue-flow-editor.png')
+const logo = require('../assets/logo.png')
 interface Menu {
     name: string,
@@ -37,4 +44,4 @@ export default {
             </div>
         )
     },
-}
\ No newline at end of file
+}