Переглянути джерело

修改配置,添加flow模块

asd26269546 2 роки тому
батько
коміт
bc4e43109d

+ 22 - 0
src/components/common-el-table/index.vue

@@ -0,0 +1,22 @@
+<template>
+    <div>
+        <el-table
+            :data="[]"
+            style="width: 100%">
+            <el-table-column
+                prop="date"
+                label="日期"
+                width="180">
+            </el-table-column>
+            <el-table-column
+                prop="name"
+                label="姓名"
+                width="180">
+            </el-table-column>
+            <el-table-column
+                prop="address"
+                label="地址">
+            </el-table-column>
+        </el-table>
+    </div>
+</template>

+ 0 - 1
src/main.js

@@ -114,7 +114,6 @@ export async function mount(props) {
 			console.log(state, prev, '子组件监听');
 		});
 	}
-	
 	//发送数据给全局
 	// props.setGlobalState({ token: 21312312 }) 
 	render(props)

+ 429 - 393
src/views/flow/model.vue

@@ -1,402 +1,438 @@
 <template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               ref="crud"
-               v-model="form"
-               :page.sync="page"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-      <template slot="menuLeft">
-        <el-button type="primary"
-                   size="small"
-                   icon="el-icon-circle-plus"
-                   v-if="permission.flow_model_create"
-                   plain
-                   @click="handleCreate">创 建
-        </el-button>
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   v-if="permission.flow_model_delete"
-                   plain
-                   @click="handleDelete">删 除
-        </el-button>
-      </template>
-      <template slot-scope="scope" slot="menu">
-        <el-button type="text"
-                   size="small"
-                   v-if="permission.flow_model_update"
-                   plain
-                   class="none-border"
-                   @click.stop="handleUpdate(scope.row,scope.index)">配置
-        </el-button>
-        <el-button type="text"
-                   size="small"
-                   v-if="permission.flow_model_deploy"
-                   plain
-                   class="none-border"
-                   @click.stop="handleDeploy(scope.row,scope.index)">部署
-        </el-button>
-        <el-button type="text"
-                   size="small"
-                   v-if="permission.flow_model_download"
-                   plain
-                   class="none-border"
-                   @click.stop="handleDownload(scope.row,scope.index)">下载
-        </el-button>
-        <el-button type="text"
-                   size="small"
-                   v-if="permission.flow_model_delete"
-                   plain
-                   class="none-border"
-                   @click.stop="handleSlotDelete(scope.row,scope.index)">删除
-        </el-button>
-      </template>
-      <template slot-scope="{row}"
-                slot="version">
-        <el-tag>v{{row.version}}</el-tag>
-      </template>
-    </avue-crud>
-    <el-dialog title="流程配置"
-               append-to-body
-               :visible.sync="flowBox"
-               :fullscreen="true">
-      <iframe
-        :src=flowUrl
-        width="100%"
-        height="700"
-        title="流程设计器"
-        frameBorder="no"
-        border="0"
-        marginWidth="0"
-        marginHeight="0"
-        scrolling="no"
-        allowTransparency="yes">
-      </iframe>
-      <span slot="footer"
-            class="dialog-footer">
-        <el-button @click="flowBox = false">取 消</el-button>
-        <el-button type="primary" @click="handleRefresh">确 定</el-button>
-      </span>
-    </el-dialog>
-    <el-dialog title="流程部署"
-               append-to-body
-               :visible.sync="deployBox"
-               width="20%">
-      <avue-form ref="form" :option="optionDeploy" v-model="form" @submit="handleSubmit"/>
-      <span slot="footer"
-            class="dialog-footer">
-        <el-button @click="deployBox = false">取 消</el-button>
-        <el-button type="primary" @click="handleDoDeploy" :loading="deployLoading">确 定</el-button>
-      </span>
-    </el-dialog>
-  </basic-container>
+	<basic-container>
+		<avue-crud
+			:option="option"
+			:table-loading="loading"
+			:data="data"
+			ref="crud"
+			v-model="form"
+			:page.sync="page"
+			@search-change="searchChange"
+			@search-reset="searchReset"
+			@selection-change="selectionChange"
+			@current-change="currentChange"
+			@size-change="sizeChange"
+			@refresh-change="refreshChange"
+			@on-load="onLoad"
+		>
+			<template slot="menuLeft">
+				<el-button
+					type="primary"
+					size="small"
+					icon="el-icon-circle-plus"
+					v-if="permission.flow_model_create"
+					plain
+					@click="handleCreate"
+					>创 建
+				</el-button>
+				<el-button
+					type="danger"
+					size="small"
+					icon="el-icon-delete"
+					v-if="permission.flow_model_delete"
+					plain
+					@click="handleDelete"
+					>删 除
+				</el-button>
+			</template>
+			<template slot-scope="scope" slot="menu">
+				<el-button
+					type="text"
+					size="small"
+					v-if="permission.flow_model_update"
+					plain
+					class="none-border"
+					@click.stop="handleUpdate(scope.row, scope.index)"
+					>配置
+				</el-button>
+				<el-button
+					type="text"
+					size="small"
+					v-if="permission.flow_model_deploy"
+					plain
+					class="none-border"
+					@click.stop="handleDeploy(scope.row, scope.index)"
+					>部署
+				</el-button>
+				<el-button
+					type="text"
+					size="small"
+					v-if="permission.flow_model_download"
+					plain
+					class="none-border"
+					@click.stop="handleDownload(scope.row, scope.index)"
+					>下载
+				</el-button>
+				<el-button
+					type="text"
+					size="small"
+					v-if="permission.flow_model_delete"
+					plain
+					class="none-border"
+					@click.stop="handleSlotDelete(scope.row, scope.index)"
+					>删除
+				</el-button>
+			</template>
+			<template slot-scope="{ row }" slot="version">
+				<el-tag>v{{ row.version }}</el-tag>
+			</template>
+		</avue-crud>
+		<el-dialog
+			title="流程配置"
+			append-to-body
+			:visible.sync="flowBox"
+			:fullscreen="true"
+		>
+			<iframe
+				:src="flowUrl"
+				width="100%"
+				height="700"
+				title="流程设计器"
+				frameBorder="no"
+				border="0"
+				marginWidth="0"
+				marginHeight="0"
+				scrolling="no"
+				allowTransparency="yes"
+			>
+			</iframe>
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="flowBox = false">取 消</el-button>
+				<el-button type="primary" @click="handleRefresh"
+					>确 定</el-button
+				>
+			</span>
+		</el-dialog>
+		<el-dialog
+			title="流程部署"
+			append-to-body
+			:visible.sync="deployBox"
+			width="20%"
+		>
+			<avue-form
+				ref="form"
+				:option="optionDeploy"
+				v-model="form"
+				@submit="handleSubmit"
+			/>
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="deployBox = false">取 消</el-button>
+				<el-button
+					type="primary"
+					@click="handleDoDeploy"
+					:loading="deployLoading"
+					>确 定</el-button
+				>
+			</span>
+		</el-dialog>
+	</basic-container>
 </template>
 
 <script>
-  import {mapGetters} from "vuex";
-  import website from '@/config/website';
-  import {modelList, removeModel, deployModel} from "@/api/flow/flow";
-  import {flowCategory} from "@/util/flow";
+import { mapGetters } from 'vuex'
+import website from '@/config/website'
+import { modelList, removeModel, deployModel } from '@/api/flow/flow'
+import { flowCategory } from '@/util/flow'
 
-  export default {
-    data() {
-      return {
-        form: {},
-        optionDeploy: {
-          menuBtn: false,
-          column: [
-            {
-              label: "流程类型",
-              type: "select",
-              dicUrl: "/api/blade-system/dict/dictionary?code=flow",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              slot: true,
-              prop: "categoryValue",
-              search: true,
-              span: 24,
-              rules: [{
-                required: true,
-                message: "请选择流程类型",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "流程模式",
-              prop: "flowMode",
-              type: "radio",
-              dicData: [
-                {
-                  label: "通用流程",
-                  value: 1
-                },
-                {
-                  label: "定制流程",
-                  value: 2
-                }
-              ],
-              value: 1,
-              span: 24,
-              rules: [
-                {
-                  required: true,
-                  message: '请选择流程模式',
-                  trigger: 'blur'
-                }
-              ],
-            },
-            {
-              label: "所属租户",
-              prop: "tenantId",
-              type: "tree",
-              multiple: true,
-              dicUrl: "/api/blade-system/tenant/select",
-              props: {
-                label: "tenantName",
-                value: "tenantId"
-              },
-              display: false,
-              span: 24,
-              rules: [
-                {
-                  required: true,
-                  message: '请选择所属租户',
-                  trigger: 'blur'
-                }
-              ],
-            },
-          ],
-        },
-        selectionId: '',
-        selectionList: [],
-        query: {},
-        loading: true,
-        deployLoading: false,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        deployBox: false,
-        flowBox: false,
-        flowUrl: '',
-        option: {
-          height: 'auto',
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          selection: true,
-          editBtn: false,
-          addBtn: false,
-          viewBtn: false,
-          delBtn: false,
-          dialogWidth: 900,
-          menuWidth: 150,
-          dialogClickModal: false,
-          column: [
-            {
-              label: '模型主键',
-              prop: 'id',
-            },
-            {
-              label: '模型标识',
-              prop: 'modelKey',
-              search: true,
-              width: 150,
-            },
-            {
-              label: '模型名称',
-              prop: 'name',
-              search: true,
-              width: 150,
-            },
-            {
-              label: '流程版本',
-              prop: 'version',
-              slot: true,
-              width: 80,
-            },
-            {
-              label: '创建时间',
-              prop: 'created',
-              width: 165,
-            },
-            {
-              label: '更新时间',
-              prop: 'lastUpdated',
-              width: 165,
-            },
-          ]
-        },
-        data: []
-      };
-    },
-    watch: {
-      'form.flowMode'() {
-        this.$refs.form.option.column.filter(item => {
-          if (item.prop === "tenantId") {
-            item.display = this.form.flowMode === 2;
-          }
-        });
-      }
-    },
-    computed: {
-      ...mapGetters(["permission"]),
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
-    },
-    methods: {
-      handleSubmit(form, done) {
-        this.deployLoading = true;
-        deployModel({
-          modelId: this.selectionId,
-          category: flowCategory(form.categoryValue),
-          tenantIds: form.tenantId.join(",")
-        }).then(res => {
-          const data = res.data;
-          if (data.success) {
-            this.$message({
-              type: "success",
-              message: data.msg
-            });
-            done();
-            this.$refs.form.resetForm();
-            this.deployBox = false;
-            this.deployLoading = false;
-          } else {
-            done();
-            this.deployLoading = false;
-            this.$message({
-              type: "warn",
-              message: data.msg
-            });
-          }
-        })
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return removeModel(this.ids);
-          })
-          .then(() => {
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-            this.onLoad(this.page);
-          });
-      },
-      handleCreate() {
-        this.flowUrl = `${website.flowDesignUrl}/index.html`;
-        this.flowBox = true;
-      },
-      handleUpdate(row) {
-        this.flowUrl = `${website.flowDesignUrl}/index.html#/editor/${row.id}`;
-        this.flowBox = true;
-      },
-      handleDeploy(row) {
-        this.deployBox = true;
-        this.selectionId = row.id;
-      },
-      handleDoDeploy() {
-        this.$refs.form.submit();
-      },
-      handleDownload(row) {
-        window.open(`${website.flowDesignUrl}/app/rest/models/${row.id}/bpmn20`);
-      },
-      handleSlotDelete(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return removeModel(row.id);
-          })
-          .then(() => {
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-            this.onLoad(this.page);
-          });
-      },
-      handleRefresh() {
-        this.flowBox = false;
-        this.onLoad(this.page);
-      },
-      currentChange(currentPage) {
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize) {
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        modelList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      }
-    }
-  };
+export default {
+	data() {
+		return {
+			form: {},
+			optionDeploy: {
+				menuBtn: false,
+				column: [
+					{
+						label: '流程类型',
+						type: 'select',
+						dicUrl: '/api/blade-system/dict/dictionary?code=flow',
+						props: {
+							label: 'dictValue',
+							value: 'dictKey',
+						},
+						dataType: 'number',
+						slot: true,
+						prop: 'categoryValue',
+						search: true,
+						span: 24,
+						rules: [
+							{
+								required: true,
+								message: '请选择流程类型',
+								trigger: 'blur',
+							},
+						],
+					},
+					{
+						label: '流程模式',
+						prop: 'flowMode',
+						type: 'radio',
+						dicData: [
+							{
+								label: '通用流程',
+								value: 1,
+							},
+							{
+								label: '定制流程',
+								value: 2,
+							},
+						],
+						value: 1,
+						span: 24,
+						rules: [
+							{
+								required: true,
+								message: '请选择流程模式',
+								trigger: 'blur',
+							},
+						],
+					},
+					{
+						label: '所属租户',
+						prop: 'tenantId',
+						type: 'tree',
+						multiple: true,
+						dicUrl: '/api/blade-system/tenant/select',
+						props: {
+							label: 'tenantName',
+							value: 'tenantId',
+						},
+						display: false,
+						span: 24,
+						rules: [
+							{
+								required: true,
+								message: '请选择所属租户',
+								trigger: 'blur',
+							},
+						],
+					},
+				],
+			},
+			selectionId: '',
+			selectionList: [],
+			query: {},
+			loading: true,
+			deployLoading: false,
+			page: {
+				pageSize: 10,
+				currentPage: 1,
+				total: 0,
+			},
+			deployBox: false,
+			flowBox: false,
+			flowUrl: '',
+			option: {
+				height: 'auto',
+				calcHeight: 30,
+				tip: false,
+				searchShow: true,
+				searchMenuSpan: 6,
+				border: true,
+				index: true,
+				selection: true,
+				editBtn: false,
+				addBtn: false,
+				viewBtn: false,
+				delBtn: false,
+				dialogWidth: 900,
+				menuWidth: 150,
+				dialogClickModal: false,
+				column: [
+					{
+						label: '模型主键',
+						prop: 'id',
+					},
+					{
+						label: '模型标识',
+						prop: 'modelKey',
+						search: true,
+						width: 150,
+					},
+					{
+						label: '模型名称',
+						prop: 'name',
+						search: true,
+						width: 150,
+					},
+					{
+						label: '流程版本',
+						prop: 'version',
+						slot: true,
+						width: 80,
+					},
+					{
+						label: '创建时间',
+						prop: 'created',
+						width: 165,
+					},
+					{
+						label: '更新时间',
+						prop: 'lastUpdated',
+						width: 165,
+					},
+				],
+			},
+			data: [],
+		}
+	},
+	watch: {
+		'form.flowMode'() {
+			this.$refs.form.option.column.filter((item) => {
+				if (item.prop === 'tenantId') {
+					item.display = this.form.flowMode === 2
+				}
+			})
+		},
+	},
+	computed: {
+		...mapGetters(['permission']),
+		ids() {
+			let ids = []
+			this.selectionList.forEach((ele) => {
+				ids.push(ele.id)
+			})
+			return ids.join(',')
+		},
+	},
+	methods: {
+		handleSubmit(form, done) {
+			this.deployLoading = true
+			deployModel({
+				modelId: this.selectionId,
+				category: flowCategory(form.categoryValue),
+				tenantIds: form.tenantId.join(','),
+			}).then((res) => {
+				const data = res.data
+				if (data.success) {
+					this.$message({
+						type: 'success',
+						message: data.msg,
+					})
+					done()
+					this.$refs.form.resetForm()
+					this.deployBox = false
+					this.deployLoading = false
+				} else {
+					done()
+					this.deployLoading = false
+					this.$message({
+						type: 'warn',
+						message: data.msg,
+					})
+				}
+			})
+		},
+		searchReset() {
+			this.query = {}
+			this.onLoad(this.page)
+		},
+		searchChange(params, done) {
+			this.query = params
+			this.page.currentPage = 1
+			this.onLoad(this.page, params)
+			done()
+		},
+		selectionChange(list) {
+			this.selectionList = list
+		},
+		selectionClear() {
+			this.selectionList = []
+			this.$refs.crud.toggleSelection()
+		},
+		handleDelete() {
+			if (this.selectionList.length === 0) {
+				this.$message.warning('请选择至少一条数据')
+				return
+			}
+			this.$confirm('确定将选择数据删除?', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(() => {
+					return removeModel(this.ids)
+				})
+				.then(() => {
+					this.$message({
+						type: 'success',
+						message: '操作成功!',
+					})
+					this.$refs.crud.toggleSelection()
+					this.onLoad(this.page)
+				})
+		},
+		handleCreate() {
+			this.flowUrl = `${website.flowDesignUrl}/index.html`
+			this.flowBox = true
+		},
+		handleUpdate(row) {
+			this.flowUrl = `${website.flowDesignUrl}/index.html#/editor/${row.id}`
+			this.flowBox = true
+		},
+		handleDeploy(row) {
+			this.deployBox = true
+			this.selectionId = row.id
+		},
+		handleDoDeploy() {
+			this.$refs.form.submit()
+		},
+		handleDownload(row) {
+			window.open(
+				`${website.flowDesignUrl}/app/rest/models/${row.id}/bpmn20`
+			)
+		},
+		handleSlotDelete(row) {
+			this.$confirm('确定将选择数据删除?', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(() => {
+					return removeModel(row.id)
+				})
+				.then(() => {
+					this.$message({
+						type: 'success',
+						message: '操作成功!',
+					})
+					this.$refs.crud.toggleSelection()
+					this.onLoad(this.page)
+				})
+		},
+		handleRefresh() {
+			this.flowBox = false
+			this.onLoad(this.page)
+		},
+		currentChange(currentPage) {
+			this.page.currentPage = currentPage
+		},
+		sizeChange(pageSize) {
+			this.page.pageSize = pageSize
+		},
+		refreshChange() {
+			this.onLoad(this.page, this.query)
+		},
+		onLoad(page, params = {}) {
+			this.loading = true
+			modelList(
+				page.currentPage,
+				page.pageSize,
+				Object.assign(params, this.query)
+			).then((res) => {
+				const data = res.data.data
+				this.page.total = data.total
+				this.data = data.records
+				this.loading = false
+				this.selectionClear()
+			})
+		},
+	},
+}
 </script>
 
 <style>
-  .none-border {
-    border: 0;
-    background-color: transparent !important;
-  }
+.none-border {
+	border: 0;
+	background-color: transparent !important;
+}
 </style>

+ 37 - 0
src/views/flow2/flowList.vue

@@ -0,0 +1,37 @@
+<template>
+	<basic-container>
+		<common-el-table></common-el-table>
+	</basic-container>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import website from '@/config/website'
+import { modelList, removeModel, deployModel } from '@/api/flow/flow'
+import { flowCategory } from '@/util/flow'
+import commonElTable from '@/components/common-el-table'
+export default {
+    components:{
+        commonElTable
+    },
+	data() {
+		return {
+			
+		}
+	},
+	watch: {
+		
+	},
+	
+	methods: {
+		
+	},
+}
+</script>
+
+<style>
+.none-border {
+	border: 0;
+	background-color: transparent !important;
+}
+</style>

+ 2 - 2
vue.config.js

@@ -50,14 +50,14 @@ module.exports = {
 		proxy: {
 			'/api': {
 				//本地服务接口地址
-				target: 'http://192.168.1.100/api',
+				target: 'https://cfm.bytesail.cn/api',
 				//远程演示服务地址,可用于直接启动项目
 				//target: 'https://saber.bladex.vip/api',
 				ws: true,
 				pathRewrite: {
 					'^/api': '/'
 				}
-			}
+			},
 		}
 	},
 	// 自定义webpack配置