提交代码

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

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

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

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

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));
     }
 
-
     /**
      * 挂载流程表单
      */

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"
   }
 }

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)
 
 // 全局方法挂载

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-row :gutter="10" class="mb8">
+        <el-col :span="1.5" v-if="false">
-          <el-col :span="1.5">
+          <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['flowable:form:add']">新增</el-button>
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['flowable:form:add']">新增</el-button>
+        </el-col>
-          </el-col>
+        <el-col :span="1.5">
-          <el-col :span="1.5">
+          <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['flowable:form:edit']">修改</el-button>
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['flowable:form:edit']">修改</el-button>
+        </el-col>
-          </el-col>
+        <el-col :span="1.5">
-          <el-col :span="1.5">
+          <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['flowable:form:remove']">删除</el-button>
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['flowable:form:remove']">删除</el-button>
+        </el-col>
-          </el-col>
+        <el-col :span="1.5">
-          <el-col :span="1.5">
+          <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['flowable:form:export']">导出</el-button>
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['flowable:form:export']">导出</el-button>
+        </el-col>
-          </el-col>
+        <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
-        </el-row>
-      </template>
 
       <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,

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目录加进来，否则生产打包会报错！！
+      }
     }
   }
 })