优化流程定义的分页接口

yudao-admin-ui/src/views/bpm/definition/index.vue

@@ -0,0 +1,56 @@
+<template>
+  <div class="app-container">
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="流程名字" align="center" prop="name" />
+    </el-table>
+
+    <!-- 分页组件 -->
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+  </div>
+</template>
+
+<script>
+import {getDefinitionPage} from "@/api/bpm/definition";
+
+export default {
+  name: "processDefinition",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 总条数
+      total: 0,
+      // 表格数据
+      list: [],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10
+      }
+    };
+  },
+  created() {
+    const key = this.$route.query && this.$route.query.key
+    if (key) {
+      this.queryParams['key'] = key
+    }
+    this.getList();
+  },
+  methods: {
+    /** 查询流程定义列表 */
+    getList() {
+      this.loading = true;
+      getDefinitionPage(this.queryParams).then(response => {
+          this.list = response.data.list;
+          this.total = response.data.total;
+          this.loading = false;
+        }
+      );
+    },
+  }
+};
+</script>
+

yudao-admin-ui/src/views/bpm/model/index.vue

@@ -68,8 +68,6 @@
         </el-table-column>
         <el-table-column label="激活状态" align="center" prop="processDefinition.version" width="80">
           <template slot-scope="scope">
-<!--            <el-tag type="success" v-if="scope.row.processDefinition && scope.row.processDefinition.suspensionState === 1">激活</el-tag>-->
-<!--            <el-tag type="warning" v-if="scope.row.processDefinition && scope.row.processDefinition.suspensionState === 2">挂起</el-tag>-->
             <el-switch v-if="scope.row.processDefinition" v-model="scope.row.processDefinition.suspensionState"
                        :active-value="1" :inactive-value="2" @change="handleStatusChange(scope.row)" />
           </template>
@@ -84,7 +82,7 @@
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-setting" @click="handleUpdate(scope.row)">设计流程</el-button>
           <el-button size="mini" type="text" icon="el-icon-thumb" @click="handleDeploy(scope.row)">发布流程</el-button>
-          <el-button size="mini" type="text" icon="el-icon-ice-cream-round" @click="handleDeploy(scope.row)">流程定义</el-button>
+          <el-button size="mini" type="text" icon="el-icon-ice-cream-round" @click="handleDefinitionList(scope.row)">流程定义</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
@@ -244,6 +242,15 @@ export default {
         this.showBpmnOpen = true
       })
     },
+    /** 跳转流程定义的列表 */
+    handleDefinitionList(row) {
+      this.$router.push({
+        path:"/bpm/manager/definition",
+        query:{
+          key: row.key
+        }
+      });
+    }
   }
 };
 </script>

yudao-admin-ui/src/views/bpm/model/modelViewer.vue

@@ -1,41 +0,0 @@
-<template>
-  <div class="app-container">
-
-    <!-- 流程设计器，负责绘制流程等 -->
-    <my-process-viewer key="designer" v-model="xmlString" v-bind="controlForm" keyboard ref="processDesigner" />
-
-  </div>
-</template>
-
-<script>
-import {getModel} from "@/api/bpm/model";
-export default {
-  name: "App",
-  components: { },
-  data() {
-    return {
-      xmlString: "", // BPMN XML
-      controlForm: {
-        prefix: "activiti"
-      },
-    };
-  },
-  created() {
-    // 如果 modelId 非空，说明是修改流程模型
-    const modelId = this.$route.query && this.$route.query.modelId
-    if (modelId) {
-      getModel(modelId).then(response => {
-        this.xmlString = response.data.bpmnXml
-      })
-    }
-  }
-};
-</script>
-
-<style lang="scss">
-
-.my-process-designer {
-  height: calc(100vh - 84px);
-}
-
-</style>

yudao-admin-ui/src/views/bpm/processDefinition/index.vue

@@ -1,192 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="模型名字" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入模型名字" clearable style="width: 240px;" size="small"
-                  @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="openBpmn"
-          v-hasPermi="['infra:config:create']"
-        >新建流程</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="流程名字" align="center" prop="name" />
-<!--      <el-table-column label="创建时间" align="center" prop="createTime" >-->
-<!--        <template slot-scope="scope">-->
-<!--          <span>{{ parseTime(scope.row.createTime) }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-      <el-table-column label="操作" align="center" >
-        <template slot-scope="scope">
-<!--          <el-button size="mini" type="text" icon="el-icon-setting" @click="change(scope.row)">设计流程</el-button>-->
-<!--          <el-button size="mini" type="text" icon="el-icon-delete" @click="deleteModel(scope.row)">删除</el-button>-->
-<!--          <el-button size="mini" type="text" icon="el-icon-thumb" @click="deployModel(scope.row)">发布</el-button>-->
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-    <el-dialog :visible.sync="showBpmnBool" :before-close="close" :fullscreen="true">
-<!--      <vue-bpmn v-if="showBpmnBool" product="activiti" @processSave="processSave" :bpmnXml="bpmnXML" :bpmnData="bpmnData" @beforeClose="close"></vue-bpmn>-->
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import {page} from "@/api/bpm/processDefinition";
-// import VueBpmn from "@/components/bpmn/VueBpmn";
-
-export default {
-  name: "processDefinition",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 显示搜索条件
-      showSearch: true,
-      showBpmnBool: false,
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      bpmnXML: null,
-      bpmnData: {},
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 10
-      }
-    };
-  },
-  // components: {VueBpmn},
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询登录日志列表 */
-    getList() {
-      this.loading = true;
-      page(this.queryParams).then(response => {
-          this.list = response.data.list;
-          this.total = response.data.total;
-          this.loading = false;
-        }
-      );
-
-    },
-    // 登录状态字典翻译
-    statusFormat(row, column) {
-      return this.selectDictLabel(this.statusOptions, row.status);
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    processSave(data) {
-      const that = this;
-      // 如果存在id 说明是修改
-      if (data.id) {
-        let postData = JSON.parse(data.metaInfo)
-        postData.bpmnXml = data.bpmnXml
-        postData.id = data.id
-        postData.name = data.name
-        postData.key = data.key
-        postData.description = data.description
-        updateModel(postData).then(response => {
-          this.msgSuccess("保存成功");
-        })
-        this.showBpmnBool = false
-        this.getList();
-        return
-      }
-      createModel(data).then(response => {
-        that.bpmnData.id = response.data
-        this.msgSuccess("保存成功");
-      })
-
-      this.showBpmnBool = false
-      this.getList();
-    },
-    openBpmn() {
-      this.bpmnData = {}
-      this.bpmnXML = ""
-      this.showBpmnBool = true
-    },
-    close() {
-      this.showBpmnBool = false
-      this.getList();
-    },
-    change(row) {
-      const that = this;
-      this.bpmnXML = ""
-      this.bpmnData = {}
-      // TODO @芋艿：修改成 getModel
-    },
-    modelDelete(row) {
-      const that = this;
-      this.$confirm('是否删除该流程！！', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function() {
-        deleteModel({
-          modelId: row.id
-        }).then(response => {
-          that.getList();
-          that.msgSuccess("删除成功");
-        })
-      })
-    },
-    modelDeploy(row) {
-      const that = this;
-      this.$confirm('是否部署该流程！！', "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "success"
-      }).then(function() {
-        deployModel({
-          modelId: row.id
-        }).then(response => {
-          that.getList();
-          that.msgSuccess("部署成功");
-        })
-      })
-    }
-  }
-};
-</script>
-<style>
-.el-dialog > .el-dialog__body{
-  margin: 0;
-  border: 0;
-}
-.bpmn-viewer-header{
-  background: white;
-}
-.v-modal{
-  z-index: 2000!important;
-}
-</style>
-