lex-xin 4 years ago
parent
commit
4240fa4a2a

+ 1 - 1
src/components/Breadcrumb/index.vue

@@ -2,7 +2,7 @@
   <el-breadcrumb class="app-breadcrumb" separator="/">
     <transition-group name="breadcrumb">
       <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
-        <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
+        <span v-if="item.redirect==='noRedirect'||index==levelList.length-1 || index != 0" class="no-redirect">{{ item.meta.title }}</span>
         <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
       </el-breadcrumb-item>
     </transition-group>

+ 8 - 9
src/components/wfd/components/Wfd.vue

@@ -233,17 +233,16 @@ export default {
       this.graph.on('afteritemselected', (items) => {
         if (items && items.length > 0) {
           if (this.previous !== '') {
-            var previousValue = ''
+            // var previousValue = ''
             const item = this.graph.findById(this.previous[0])
             if (item !== undefined) {
-              previousValue = { ...item.getModel() }
-              console.log(previousValue)
-              var err = this.verifyProcess(previousValue)
-              if (err !== '') {
-                this.selectedModel = previousValue
-                this.$message.error(err)
-                return
-              }
+              // previousValue = { ...item.getModel() }
+              // var err = this.verifyProcess(previousValue)
+              // if (err !== '') {
+              //   this.selectedModel = previousValue
+              //   this.$message.error(err)
+              //   return
+              // }
             }
           }
           const item = this.graph.findById(items[0])

+ 3 - 3
src/layout/components/Navbar.vue

@@ -2,7 +2,7 @@
   <div class="navbar">
     <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
 
-    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
+    <!-- <breadcrumb id="breadcrumb-container" class="breadcrumb-container" /> -->
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
@@ -35,7 +35,7 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
+// import Breadcrumb from '@/components/Breadcrumb'
 import Hamburger from '@/components/Hamburger'
 import ErrorLog from '@/components/ErrorLog'
 import Screenfull from '@/components/Screenfull'
@@ -43,7 +43,7 @@ import Search from '@/components/HeaderSearch'
 
 export default {
   components: {
-    Breadcrumb,
+    // Breadcrumb,
     Hamburger,
     ErrorLog,
     Screenfull,

+ 4 - 4
src/layout/components/TagsView/index.vue

@@ -17,10 +17,10 @@
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
-      <li @click="refreshSelectedTag(selectedTag)">Refresh</li>
-      <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">Close</li>
-      <li @click="closeOthersTags">Close Others</li>
-      <li @click="closeAllTags(selectedTag)">Close All</li>
+      <li @click="refreshSelectedTag(selectedTag)">刷新</li>
+      <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">关闭</li>
+      <li @click="closeOthersTags">关闭其它</li>
+      <li @click="closeAllTags(selectedTag)">关闭所有</li>
     </ul>
   </div>
 </template>

+ 2 - 2
src/settings.js

@@ -13,13 +13,13 @@ module.exports = {
    * @type {boolean} true | false
    * @description Whether need tagsView
    */
-  tagsView: false,
+  tagsView: true,
 
   /**
    * @type {boolean} true | false
    * @description Whether fix the header
    */
-  fixedHeader: false,
+  fixedHeader: true,
 
   /**
    * @type {boolean} true | false

+ 5 - 8
src/views/process/admin/process-manager.vue

@@ -341,9 +341,6 @@ export default {
     },
     // 获取部门
     async getDepartments() {
-      // getOrdinaryDeptList().then(response => {
-      //   this.departments = response.data
-      // })
       await treeselect().then(response => {
         this.departments = response.data
       })
@@ -376,14 +373,13 @@ export default {
       await this.getUsers()
       await this.getRoles()
       await this.getDepartments()
-      // await this.getTaskList()
       await this.getProcessList()
       await this.getPostOptions()
     },
     async handleCreate() {
-      // load.startLoading()
-      // await this.getProcessInitData()
-      // load.endLoading()
+      load.startLoading()
+      await this.getProcessInitData()
+      load.endLoading()
       this.ruleForm = {
         id: undefined,
         name: '',
@@ -409,7 +405,6 @@ export default {
       await this.getProcessInitData()
       load.endLoading()
       this.wfdDesignRefresh = false
-      this.open = true
       await processDetails({
         processId: row.id
       }).then(response => {
@@ -430,6 +425,7 @@ export default {
           this.wfdDesignRefresh = true
         })
       })
+      this.open = true
     },
     handleClose(done) {
       this.$confirm('确认关闭?')
@@ -442,6 +438,7 @@ export default {
         .catch(_ => {})
     },
     verifyProcess(structureValue) {
+      console.log(structureValue)
       for (var r of structureValue.nodes) {
         if (r.sort === undefined || r.sort === null || r.sort === '') {
           return '流程节点顺序不能为空'