提交代码

2024-08-20 22:49:01 +08:00 · 2024-08-20 22:11:40 +08:00
13 changed files with 1642 additions and 317 deletions
--- a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java
+++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java
@ -31,7 +31,7 @@ import java.util.stream.Collectors;
@Slf4j
@Api(tags = "业务工作流程")
@RestController
-@RequestMapping("/flowable/businessKey")
+@RequestMapping("/businessKey")
 public class FlowBusinessKeyController extends BaseController {

    @Autowired
--- a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowDefinitionController.java
+++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowDefinitionController.java
@ -49,7 +49,7 @@ import java.util.Map;
@Slf4j
@Api(tags = "流程定义")
@RestController
-@RequestMapping("/flowable/definition")
+@RequestMapping("/definition")
 public class FlowDefinitionController extends BaseController {

    @Autowired
--- a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowInstanceController.java
+++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowInstanceController.java
@ -21,7 +21,7 @@ import java.util.Map;
@Slf4j
@Api(tags = "工作流流程实例管理")
@RestController
-@RequestMapping("/flowable/instance")
+@RequestMapping("/instance")
 public class FlowInstanceController {

    @Autowired
--- a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowTaskController.java
+++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowTaskController.java
@ -30,7 +30,7 @@ import java.io.OutputStream;
@Slf4j
@Api(tags = "工作流流程任务管理")
@RestController
-@RequestMapping("/flowable/task")
+@RequestMapping("/task")
 public class FlowTaskController  {

    @Autowired
--- a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/SysFormController.java
+++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/SysFormController.java
@ -24,7 +24,7 @@ import java.util.List;
 * @date 2021-04-03
 */
@RestController
-@RequestMapping("/flowable/form")
+@RequestMapping("/form")
 public class SysFormController extends BaseController {
    
    @Autowired
@ -100,7 +100,6 @@ public class SysFormController extends BaseController {
        return toAjax(SysFormService.deleteSysFormByIds(formIds));
    }

-
    /**
     * 挂载流程表单
     */
--- a/yanzhu-ui-vue3/package.json
+++ b/yanzhu-ui-vue3/package.json
@ -23,6 +23,7 @@
    "bpmn-js": "^8.10.0",
    "bpmn-js-task-resize": "^1.2.0",
    "bpmn-js-token-simulation": "^0.10.0",
+    "codemirror-editor-vue3": "^2.0.6",
    "echarts": "5.4.0",
    "element-plus": "2.2.27",
    "file-saver": "2.0.5",
@ -44,6 +45,8 @@
    "vite": "3.2.3",
    "vite-plugin-compression": "0.5.1",
    "vite-plugin-svg-icons": "2.0.1",
-    "vite-plugin-vue-setup-extend": "0.4.0"
+    "vite-plugin-vue-setup-extend": "0.4.0",
+    "vue-eslint-parser": "9.1.0",
+    "vue-tsc": "0.35.0"
  }
 }
--- a/yanzhu-ui-vue3/src/api/flowable/category/index.ts
+++ b/yanzhu-ui-vue3/src/api/flowable/category/index.ts
@ -1,55 +0,0 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { CategoryForm, CategoryQuery, CategoryVO } from '@/api/flowable/category/types';
-
-// 查询流程分类列表
-export function listCategory(query: CategoryQuery): AxiosPromise<CategoryVO[]> {
-  return request({
-    url: '/flowable/category/list',
-    method: 'get',
-    params: query
-  });
-}
-
-// 查询流程分类列表
-export function listAllCategory(query?: CategoryQuery): AxiosPromise<CategoryVO[]> {
-  return request({
-    url: '/flowable/category/listAll',
-    method: 'get',
-    params: query
-  });
-}
-
-// 查询流程分类详细
-export function getCategory(categoryId?: string | number): AxiosPromise<CategoryVO> {
-  return request({
-    url: '/flowable/category/' + categoryId,
-    method: 'get'
-  });
-}
-
-// 新增流程分类
-export function addCategory(data: CategoryForm) {
-  return request({
-    url: '/flowable/category',
-    method: 'post',
-    data: data
-  });
-}
-
-// 修改流程分类
-export function updateCategory(data: CategoryForm) {
-  return request({
-    url: '/flowable/category',
-    method: 'put',
-    data: data
-  });
-}
-
-// 删除流程分类
-export function delCategory(categoryIds?: string | number | Array<string | number>) {
-  return request({
-    url: '/flowable/category/' + categoryIds,
-    method: 'delete'
-  });
-}
--- a/yanzhu-ui-vue3/src/api/flowable/category/types.ts
+++ b/yanzhu-ui-vue3/src/api/flowable/category/types.ts
@ -1,24 +0,0 @@
-/**
- * 流程分类查询对象类型
- */
-export interface CategoryQuery extends PageQuery {
-  categoryName?: string;
-  code?: string;
-}
-
-/**
- * 流程分类返回对象
- */
-export interface CategoryVO extends BaseEntity {
-  categoryId: string | number;
-  categoryName: string;
-  code: string;
-  remark: string;
-}
-
-export interface CategoryForm {
-  categoryId?: string | number;
-  categoryName?: string;
-  code?: string;
-  remark?: string;
-}
--- a/yanzhu-ui-vue3/src/lib/vform/designer.umd.js
+++ b/yanzhu-ui-vue3/src/lib/vform/designer.umd.js
--- a/yanzhu-ui-vue3/src/main.js
+++ b/yanzhu-ui-vue3/src/main.js
@ -44,6 +44,10 @@ import TreeSelect from '@/components/TreeSelect'
 import DictTag from '@/components/DictTag'
 // 预设动画
 import animate from './animate';
+// VForm3 
+import VForm3 from '@/lib/vform/designer.umd.js';
+import './lib/vform/designer.style.css';
+
 const app = createApp(App)

 // 全局方法挂载
--- a/yanzhu-ui-vue3/src/views/flowable/category/index.vue
+++ b/yanzhu-ui-vue3/src/views/flowable/category/index.vue
@ -1,211 +0,0 @@
-<template>
-  <div class="app-container">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div class="search" v-show="showSearch">
-        <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
-          <el-form-item label="分类名称" prop="categoryName">
-            <el-input v-model="queryParams.categoryName" placeholder="请输入分类名称" clearable @keyup.enter="handleQuery" />
-          </el-form-item>
-          <el-form-item label="分类编码" prop="code">
-            <el-input v-model="queryParams.code" placeholder="请输入分类编码" clearable @keyup.enter="handleQuery" />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-    </transition>
-    <el-card shadow="never">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['flowable:category:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['flowable:category:edit']">
-              修改
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['flowable:category:remove']">
-              删除
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport()" v-hasPermi="['flowable:category:export']">导出</el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template>
-
-      <el-table v-loading="loading" :data="categoryList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="分类编号" align="center" prop="categoryId" v-if="true" />
-        <el-table-column label="分类名称" align="center" prop="categoryName" />
-        <el-table-column label="分类编码" align="center" prop="code" />
-        <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['flowable:category:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['flowable:category:remove']"></el-button>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-    </el-card>
-
-    <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="categoryFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="分类名称" prop="categoryName">
-          <el-input v-model="form.categoryName" placeholder="请输入分类名称" />
-        </el-form-item>
-        <el-form-item label="分类编码" prop="code">
-          <el-input v-model="form.code" placeholder="请输入分类编码" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup name="Category" lang="ts">
-import { listCategory, getCategory, delCategory, addCategory, updateCategory } from "@/api/flowable/category";
-import { CategoryForm, CategoryQuery, CategoryVO } from "@/api/flowable/category/types";
-import { ComponentInternalInstance } from "vue";
-import { ElForm } from 'element-plus';
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
-const categoryList = ref<CategoryVO[]>([]);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref<Array<number | string>>([]);
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-
-const queryFormRef = ref(ElForm);
-const categoryFormRef = ref(ElForm);
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
-const initFormData: CategoryForm = {
-  categoryId: undefined,
-  categoryName: '',
-  code: '',
-  remark: ''
-}
-const data = reactive<PageData<CategoryForm, CategoryQuery>>({
-  form: {...initFormData},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    categoryName: '',
-    code: ''
-  },
-  rules: {
-    categoryName: [{ required: true, message: "分类名称不能为空", trigger: "blur" }],
-    code: [{ required: true, message: "分类编码不能为空", trigger: "blur" }]
-  }
-});
-
-const { queryParams, form, rules } = toRefs(data);
-
-/** 查询参数列表 */
-const getList = async () => {
-  loading.value = true;
-  const res = await listCategory(queryParams.value);
-  categoryList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
-}
-/** 取消按钮 */
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-}
-/** 表单重置 */
-const reset = () => {
-  form.value = {...initFormData};
-  categoryFormRef.value.resetFields();
-}
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.value.pageNum = 1;
-  getList();
-}
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value.resetFields();
-  handleQuery();
-}
-/** 多选框选中数据 */
-const handleSelectionChange = (selection: CategoryVO[]) => {
-  ids.value = selection.map(item => item.categoryId);
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
-}
-/** 新增按钮操作 */
-const handleAdd = () => {
-  dialog.visible = true;
-  dialog.title = "添加参数";
-  nextTick(() => {
-    reset();
-  })
-}
-/** 修改按钮操作 */
-const handleUpdate = (row?: CategoryVO) => {
-  dialog.visible = true;
-  dialog.title = "修改参数";
-  const categoryId = row?.categoryId || ids.value[0];
-  nextTick(async () => {
-    reset();
-    const res = await getCategory(categoryId);
-    form.value = res.data;
-  })
-}
-/** 提交按钮 */
-const submitForm = () => {
-  categoryFormRef.value.validate(async (valid: boolean) => {
-    if (valid) {
-      form.value.categoryId ? await updateCategory(form.value) : await addCategory(form.value);
-      proxy?.$modal.msgSuccess("操作成功");
-      dialog.visible = false;
-      getList();
-    }
-  });
-}
-/** 删除按钮操作 */
-const handleDelete = async (row?: CategoryVO) => {
-  const categoryIds = row?.categoryId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除参数编号为"' + categoryIds + '"的数据项？');
-  await delCategory(categoryIds);
-  getList();
-  proxy?.$modal.msgSuccess("删除成功");
-}
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download("flowable/category/export", {
-    ...queryParams.value
-  }, `category_${new Date().getTime()}.xlsx`);
-}
-
-onMounted(() => {
-  getList();
-})
-</script>
--- a/yanzhu-ui-vue3/src/views/flowable/form/index.vue
+++ b/yanzhu-ui-vue3/src/views/flowable/form/index.vue
@ -13,24 +13,22 @@
        </el-form>
      </div>
    </transition>
-    <el-card shadow="never">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['flowable:form:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['flowable:form:edit']">修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['flowable:form:remove']">删除</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['flowable:form:export']">导出</el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template>
+    
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5" v-if="false">
+          <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['flowable:form:add']">新增</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['flowable:form:edit']">修改</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['flowable:form:remove']">删除</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['flowable:form:export']">导出</el-button>
+        </el-col>
+        <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>

      <el-table v-loading="loading" :data="formList" @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55" align="center" />
@ -52,7 +50,6 @@
        </el-table-column>
      </el-table>
      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-    </el-card>

    <!-- 流程表单设计器对话框 -->
    <el-dialog :title="designer.title" v-model="designer.visible" fullscreen>
@ -115,7 +112,7 @@ const queryFormRef = ref(ElForm);
 const designerConfig = reactive({
  externalLink: true,
  toolbarMaxWidth: 510,
-  // languageMenu: true,
+  //languageMenu: true,
  //externalLink: false,
  //formTemplates: false,
  //eventCollapse: false,
--- a/yanzhu-ui-vue3/vite.config.js
+++ b/yanzhu-ui-vue3/vite.config.js
@ -53,6 +53,17 @@ export default defineConfig(({ mode, command }) => {
          }
        ]
      }
+    },
+    // 预编译
+    optimizeDeps: {
+      include: [
+        '@/lib/vform/designer.umd.js',
+      ]
+    },
+    build: {
+      commonjsOptions: {
+        include: /node_modules|lib/ //这里记得把lib目录加进来，否则生产打包会报错！！
+      }
    }
  }
 })
Author	SHA1	Message	Date
姜玉琦	e9d43fbdfa	提交代码	2024-08-20 22:49:01 +08:00
姜玉琦	0bf42f74cf	提交代码	2024-08-20 22:11:40 +08:00