操作按钮添加表单/流程节点绑定正常节点异常处理

ruoyi-ui/src/views/system/bpmnPro/components/bo-utils/getNodeMsg.js

@@ -183,6 +183,8 @@ const blackArr = [
   "process",
   "startEvent",
   "outgoing",
+  "unusualTask",
+  "extensionElements",
   // "task",
   "incoming",
   "outgoing",

ruoyi-ui/src/views/system/excuteBtnMange/index.vue

@@ -300,18 +300,18 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="执行流程" prop="btnTableKey">
+              <el-form-item label="执行流程" prop="btnProcessKey">
                 <el-select
-                  v-model="btnGroupFormData.btnTableKey"
+                  v-model="btnGroupFormData.btnProcessKey"
                   placeholder="请选择执行流程"
                   clearable
                   filterable
                 >
                   <el-option
-                    v-for="item in []"
-                    :key="item.fId"
-                    :label="item.dfName"
-                    :value="item.fId"
+                    v-for="item in processOptions"
+                    :key="item.processKey"
+                    :label="item.processName"
+                    :value="item.processKey"
                   >
                   </el-option>
                 </el-select>
@@ -538,14 +538,19 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        menuName: [
-          { required: true, message: "菜单名称不能为空", trigger: "blur" },
+        btnParentId: [
+          { required: true, message: "上级按钮不能为空", trigger: "change" },
         ],
-        orderNum: [
-          { required: true, message: "菜单顺序不能为空", trigger: "blur" },
+        btnGroupName: [
+          { required: true, message: "按钮组名不能为空", trigger: "blur" },
         ],
-        path: [
-          { required: true, message: "路由地址不能为空", trigger: "blur" },
+        btnSort: [{ required: true, message: "排序不能为空", trigger: "blur" }],
+        btnType: [
+          {
+            required: true,
+            message: "按钮类型不能为空",
+            trigger: "change",
+          },
         ],
       },
       // 按钮组表单数据
@@ -756,10 +761,28 @@ export default {
         this.title = "修改菜单";
       });
     },
+    // 校验复杂逻辑表单数据
+    myValidate(formData) {
+      // 校验按钮名和按钮必须填一个
+      let res = {};
+      res.flag = true;
+      let nameOrIcon = !!formData.btnName || !!formData.btnIcon;
+      if (!nameOrIcon) {
+        res.flag = false;
+        res.msg = "按钮名称和图标,至少需要有一个!";
+        return res;
+      }
+      return res;
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["btnGroupFormRef"].validate(async (valid) => {
         if (valid) {
+          let validateRes = myValidate(this.btnGroupFormData);
+          if (!validateRes.flag) {
+            this.$message.error(validateRes.msg);
+            return;
+          }
           if (this.editType) {
             // 新增按钮组
             this.btnGroupFormData.btnKey = uuidv4();

ruoyi-ui/src/views/system/fromModel/index.vue

@@ -108,7 +108,7 @@ export default {
           dfHtmlTemplate: editorHtmlJson.toString(),
           dfTableName: mainTableName,
           dfNotes: formDescription,
-          dfFormSql: formSQL,
+          dfFormSql: JSON.stringify(formSQL),
           dfNodeId: formNodeId,
         }).then((res) => {
           console.log(res);

ruoyi-ui/src/views/tableMange/index.vue

@@ -889,12 +889,12 @@ export default {
     // 数据统计字段表名中文
     isShowTableName() {
       let tableComment;
-      this.tableList.forEach(item => {
-        if(item.tableName === this.tableName){
-          tableComment = item.tableComment
+      this.tableList.forEach((item) => {
+        if (item.tableName === this.tableName) {
+          tableComment = item.tableComment;
         }
-      })
-      return tableComment
+      });
+      return tableComment;
     },
     ...mapState({
       databaseName: (state) => state.user.dataSource.databaseName,
@@ -1676,6 +1676,7 @@ export default {
               this.dragTableStatisticList.forEach((item) => {
                 item.tableKey = this.editData.tableKey;
               });
+              console.log(res);
               res1 = await updateStatistic({
                 tableKey: this.editData.tableKey,
                 dragTableStatisticList: this.dragTableStatisticList,

ruoyi-ui/src/views/tablelist/commonTable/BtnMenu.vue

@@ -68,6 +68,10 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.myDiv {
+  padding: 5px;
+  box-sizing: border-box;
+}
 .pre-icon {
   margin-right: 5px;
 }

ruoyi-ui/src/views/tablelist/commonTable/listInfo.vue

@@ -208,7 +208,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        v-show="isShowExcuteCol"
+        v-if="isShowExcuteCol"
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -385,6 +385,7 @@ export default {
   },
   computed: {
     isShowExcuteCol() {
+      console.log(!this.excuteBtnArr?.every((arr) => arr.children.length == 0));
       // return true;
       return !this.excuteBtnArr?.every((arr) => arr.children.length == 0);
     },
@@ -457,12 +458,12 @@ export default {
           getStatisticList({
             queryMap: {
               tableKey: this.templateInfo.template.tableKey,
-              queryCriteriaValue: this.queryParams.queryMap.queryCriteriaValue
+              queryCriteriaValue: this.queryParams.queryMap.queryCriteriaValue,
             },
-          }).then(res => {
+          }).then((res) => {
             // console.log('getStatisticList', res);
-            this.statisticList = res.data
-          })
+            this.statisticList = res.data;
+          });
         });
     },
     isUpperCase(char) {