Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/api/dragform/form.js

@@ -77,6 +77,27 @@ export function dragTablePreview(query) {
   })
 }
 
+// 获取弹窗结构数据
+export function getProcessPopupTableInfo(data) {
+  return request({
+    url: '/dragform/commonbtn/getProcessPopupTableInfo',
+    method: 'get',
+    params: data,
+    baseURL: process.env.VUE_APP_BASE_API3
+  })
+}
+// 获取弹窗渲染数据
+export function getProcessPopupTableList(data) {
+  return request({
+    url: '/dragform/commonbtn/getProcessPopupTableList',
+    method: 'get',
+    params: data,
+    baseURL: process.env.VUE_APP_BASE_API3
+  })
+}
+
+
+
 
 
 

ruoyi-ui/src/components/kFormDesign/OptionsEdit.vue

@@ -166,6 +166,8 @@
                   <template slot-scope="scope">
                     <el-select
                       v-model="scope.row.fieldName"
+                      filterable
+                      clearable
                       placeholder="请选择"
                     >
                       <el-option

ruoyi-ui/src/main.js

@@ -125,5 +125,8 @@ new Vue({
   el: '#app',
   router,
   store,
-  render: h => h(App)
+  render: h => h(App),
+  beforeCreate() {
+    Vue.prototype.$bus = this
+  }
 })

ruoyi-ui/src/views/bussiness/processMange.vue

@@ -78,6 +78,12 @@
               <span v-else-if="col.prop == 'benTaskNodeState'">{{
                 scope.row.benTaskNodeState == "0" ? "未执行" : "已执行"
               }}</span>
+              <span v-else-if="col.prop == 'bepTaskProcessState'">{{
+                getDictLabel(
+                  scope.row.bepTaskProcessState,
+                  dict.type.task_process_state
+                )
+              }}</span>
               <span v-else>{{ scope.row[col.prop] }}</span>
             </template>
           </el-table-column>
@@ -160,10 +166,16 @@
             :defaultValue="defaultValue"
             :value="jsonData"
           />
-          <NodeInfoDialog
+          <DialogTemplate
             v-else-if="formType == 'composeForm'"
-            :taskInfo="taskInfo"
-          ></NodeInfoDialog>
+            ref="dialogRef"
+            :groupKey="groupKey"
+            :rowobj="row"
+            :subCount="subCount"
+            :tableCount="tableCount"
+            :subTableName="subTableName"
+            @addList="() => {}"
+          ></DialogTemplate>
           <component
             v-else-if="formType == 'designForm'"
             :is="myForm"
@@ -189,12 +201,12 @@ import { triggerExceptionNode } from "@/api/bpmprocess/process";
 import getNodeSequence from "@/utils/bpmn/getNodeSequence";
 import GY1 from "./dialogCompments/GY1.vue";
 import { getForm } from "@/api/dragform/form";
-import NodeInfoDialog from "@/views/dialogTemplate/components/NodeInfoDialog.vue";
+import DialogTemplate from "@/views/dialogTemplate/components/index.vue";
 export default {
   name: "processMange",
   props: [],
-  components: { GY1, NodeInfoDialog },
-  dicts: ["bpm_type"],
+  components: { GY1, DialogTemplate },
+  dicts: ["bpm_type", "task_process_state"],
   data() {
     return {
       row: {}, //当前操作行数据
@@ -255,9 +267,15 @@ export default {
       formType: "", //表单类型 dragForm:拖拽表单 composeForm:工艺组合表单   designForm:定制表单
       // k-form-build 数据
       dynamicData: {},
+      tableName: "",
       defaultValue: {},
       jsonData: {},
-      taskInfo: {}, //
+      // 拖拽数据
+      taskInfo: {},
+      groupKey: "",
+      subCount: {},
+      tableCount: {},
+      subTableName: "",
     };
   },
   computed: {},
@@ -315,16 +333,34 @@ export default {
     },
     // 打开运行节点弹窗
     async opneExecuteNode(row) {
+      console.log(row);
       this.resetDialogForm();
       let preFix = row.benTaskNodeName.split("-")[0];
-      if (row.benTaskNodeFormKey) {
-        if (row.benTaskNodeFormType == "dragForm") {
+      let {
+        benTaskNodeFormKey,
+        benTaskNodeFormType,
+        bepTaskPlanKey,
+        bepTaskKey,
+        bepTaskNodeKey,
+      } = row;
+      if (benTaskNodeFormKey) {
+        if (benTaskNodeFormType == "dragForm") {
           //拖拽表单
           this.formType = "dragForm";
-          await this.getDragFormInfo(row.benTaskNodeFormKey);
-        } else if (row.benTaskNodeFormType == "composeForm") {
+          await this.getDragFormInfo(benTaskNodeFormKey);
+        } else if (benTaskNodeFormType == "composeForm") {
           //工艺组合表单
           this.formType = "composeForm";
+          this.groupKey = benTaskNodeFormKey;
+          let queryPayload = {
+            "${task_plan_key": bepTaskPlanKey,
+            "${task_key": bepTaskKey,
+            "${task_node_key": bepTaskNodeKey,
+            groupKey: benTaskNodeFormKey,
+          };
+          this.$nextTick(() => {
+            this.$refs.dialogRef.getLists(queryPayload);
+          });
         }
       } else if (preFix) {
         //定制表单
@@ -332,13 +368,12 @@ export default {
         this.myForm = preFix;
       }
       this.row = row; //记录当前行数据
-      if (!this.formType) return;
+      if (!this.formType) return; //没有表单,直接掉运行逻辑
       this.open = true; // 打开弹窗
       // 根据当前节点绑定的表单信息查询对应的表单进行展示
     },
-    // 运行节点按钮
+    // 运行节点按钮 确认运行回调
     async executeNode() {
-      console.log(this.row);
       let { benTaskNodeKey, bepTaskProcessXmlContent, implementationName } =
         this.row;
       let { nodeId, nextNodeId } = this.getNextNodeKey(
@@ -346,30 +381,34 @@ export default {
         bepTaskProcessXmlContent
       );
       let formData = await this.getFormData();
-
-      // let payLoad = {
-      //   basicMap: {
-      //     taskNodeKey: nodeId,
-      //     nextNodeKey: nextNodeId,
-      //     // tableName: "",
-      //     implementationName: this.row.benmTaskAutomaticScriptTriggerType,
-      //     taskProcessKey: this.row.bepTaskKey,
-      //   },
-      //   commMap: {
-      //     //formData
-      //   },
-      // };
-
+      formData.taskPlanKey = this.row.bepTaskPlanKey;
       let payLoad = {
         taskProcessKey: this.row.bepTaskKey, //当前任务流程编码
         taskNodeKey: nodeId, //当前执行节点唯一编码
         nextNodeKey: nextNodeId, //下一节点编码
         implementationName: this.row.benmTaskAutomaticScriptTriggerType, //当前节点绑定的脚本名
         taskProcessXmlContent: this.row.bepTaskProcessXmlContent, //当前流程xml
-        formDataMap: formData, //自定义表单组件收集的表单数据
+        tableName: this.tableName,
+        formDataMap: JSON.stringify(formData), //自定义表单组件收集的表单数据
       };
-      runProcessNodeExecution(payLoad).then((res) => {
-        console.log(res);
+      let fileXML = new File(
+        [this.row.bepTaskProcessXmlContent],
+        this.row.bepTaskKey + ".bpmn",
+        {
+          type: "text/bpmn",
+        }
+      );
+      const subformData = new FormData();
+      subformData.append("fileXML", fileXML);
+      for (let key in payLoad) {
+        subformData.append(key, payLoad[key] == null ? "" : payLoad[key]);
+      }
+      runProcessNodeExecution(subformData).then((res) => {
+        if (res.code == 200) {
+          this.$message.success("运行成功!");
+          this.getList();
+          this.open = false;
+        }
       });
       console.log(payLoad);
     },
@@ -377,8 +416,14 @@ export default {
     async getDragFormInfo(fid) {
       try {
         let res = await getForm(fid);
+        console.log(res);
         if (res.code == 200) {
           this.jsonData = JSON.parse(res.data.dfVueTemplate);
+          this.tableName = res.data.dfTableName;
+          if (res.data.dfFormSql) {
+            this.dynamicData = JSON.parse(res.data.dfFormSql);
+            console.log(this.dynamicData);
+          }
         } else {
           console.log(res);
           this.$message.error("网络异常,请稍后再试");
@@ -390,7 +435,6 @@ export default {
     },
     // 关闭运行节点弹窗
     closeExecuteNode(row) {
-      console.log(row);
       this.open = false;
     },
     // 获取下一个节点的nodekey

ruoyi-ui/src/views/dialogMange/components/RelayDialog.vue

@@ -99,6 +99,7 @@ export default {
       let res = {
         flag: false,
       };
+      this.$emit("saveRelayRes", res);
       this.isShow = false;
     },
     confirmHandler() {

ruoyi-ui/src/views/dialogMange/components/relayTable.vue

@@ -34,7 +34,12 @@
             :key="val.fieldName"
             :label="val.fieldDescription"
             :value="val.fieldName"
-          ></el-option>
+          >
+            <span style="float: left">{{ val.fieldDescription }}</span>
+            <span style="float: right; color: #8492a6; font-size: 13px">{{
+              val.fieldName
+            }}</span>
+          </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="操作列按钮" prop="btnGroupList">
@@ -64,7 +69,12 @@
             :key="val.fieldName"
             :label="val.fieldDescription"
             :value="val.tableName + '.' + val.fieldName"
-          ></el-option>
+          >
+            <span style="float: left">{{ val.fieldDescription }}</span>
+            <span style="float: right; color: #8492a6; font-size: 13px">{{
+              val.fieldName
+            }}</span>
+          </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="排序方式" v-show="formData.orderByColumn">

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

@@ -150,6 +150,7 @@
         <SubList
           ref="subList"
           v-show="tabIndex == '1'"
+          :tableListName="'tableList1'"
           :menudata="menudata"
           :tableList="tableList"
           :echoData="subEchoData.echoData"
@@ -160,6 +161,7 @@
         <SubList
           ref="StatusTable"
           v-show="tabIndex == '2'"
+          :tableListName="'tableList2'"
           :menudata="menudata"
           :tableList="tableList"
           :echoData="countEchoData.echoData"
@@ -208,7 +210,15 @@
                       :key="val.fieldName"
                       :label="val.fieldDescription"
                       :value="val.fieldName"
-                    ></el-option>
+                    >
+                      <span style="float: left">{{
+                        val.fieldDescription
+                      }}</span>
+                      <span
+                        style="float: right; color: #8492a6; font-size: 13px"
+                        >{{ val.fieldName }}</span
+                      >
+                    </el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item label="操作列按钮" prop="btnGroupList">
@@ -236,7 +246,15 @@
                       :key="val.fieldName"
                       :label="val.fieldDescription"
                       :value="val.fieldName"
-                    ></el-option>
+                    >
+                      <span style="float: left">{{
+                        val.fieldDescription
+                      }}</span>
+                      <span
+                        style="float: right; color: #8492a6; font-size: 13px"
+                        >{{ val.fieldName }}</span
+                      >
+                    </el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item label="排序方式" v-show="formData.orderByColumn">
@@ -359,6 +377,83 @@
                 :dragTableList="dragTableList"
                 :tableList="tableList"
               />
+              <el-button
+                type="primary"
+                class="inline-large-button addcount"
+                icon="el-icon-plus"
+                size="mini"
+                @click="addDataDialog"
+              >
+                添加数据字段
+              </el-button>
+              <el-table
+                :data="dragTableStatisticList"
+                border
+                class="mb10"
+                style="width: 100%"
+              >
+                <!-- <el-table-column prop="number" label="序号" width="50"> -->
+                <!-- style="width: 100%"> -->
+                <el-table-column
+                  type="index"
+                  label="序号"
+                  width="50"
+                  class-name="allowDrag"
+                >
+                </el-table-column>
+
+                <el-table-column
+                  prop="statisticTitle"
+                  label="统计标题"
+                  width="83"
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="statisticField"
+                  label="统计数据"
+                  width="80"
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="statisticType"
+                  label="统计类型"
+                  width="50"
+                >
+                </el-table-column>
+                <el-table-column
+                  label="操作"
+                  align="center"
+                  class-name="small-padding fixed-width"
+                >
+                  <template slot-scope="scope">
+                    <el-dropdown>
+                      <el-button type="warning" plain size="small">
+                        处理<i class="el-icon-arrow-down el-icon--right"></i>
+                      </el-button>
+                      <el-dropdown-menu slot="dropdown">
+                        <el-dropdown-item>
+                          <el-button
+                            size="mini"
+                            type="text"
+                            icon="el-icon-edit"
+                            @click="handleUpdateStat(scope.row)"
+                            >修改
+                          </el-button>
+                        </el-dropdown-item>
+                        <el-dropdown-item>
+                          <el-button
+                            size="mini"
+                            type="text"
+                            icon="el-icon-delete"
+                            @click="handleDeleteStat(scope.row)"
+                            >删除
+                          </el-button>
+                        </el-dropdown-item>
+                      </el-dropdown-menu>
+                    </el-dropdown>
+                  </template>
+                </el-table-column>
+              </el-table>
             </el-card>
           </el-tab-pane>
           <el-tab-pane label="数据统计" name="datacount">
@@ -422,7 +517,15 @@
                       :key="val.fieldName"
                       :label="val.fieldDescription"
                       :value="val.fieldName"
-                    ></el-option>
+                    >
+                      <span style="float: left">{{
+                        val.fieldDescription
+                      }}</span>
+                      <span
+                        style="float: right; color: #8492a6; font-size: 13px"
+                        >{{ val.fieldName }}</span
+                      >
+                    </el-option>
                   </el-select>
                 </el-form-item>
 
@@ -438,87 +541,17 @@
                       :label="item.fieldDescription"
                       :value="item.fieldName"
                     >
+                      <span style="float: left">{{
+                        item.fieldDescription
+                      }}</span>
+                      <span
+                        style="float: right; color: #8492a6; font-size: 13px"
+                        >{{ item.fieldName }}</span
+                      >
                     </el-option>
                   </el-select>
                 </el-form-item>
               </el-form>
-              <el-button
-                type="primary"
-                class="inline-large-button addcount"
-                icon="el-icon-plus"
-                size="mini"
-                @click="addDataDialog"
-              >
-                添加数据字段
-              </el-button>
-              <el-table
-                :data="dragTableStatisticList"
-                border
-                class="mb10"
-                style="width: 100%"
-              >
-                <!-- <el-table-column prop="number" label="序号" width="50"> -->
-                <!-- style="width: 100%"> -->
-                <el-table-column
-                  type="index"
-                  label="序号"
-                  width="50"
-                  class-name="allowDrag"
-                >
-                </el-table-column>
-
-                <el-table-column
-                  prop="statisticTitle"
-                  label="统计标题"
-                  width="83"
-                >
-                </el-table-column>
-                <el-table-column
-                  prop="statisticField"
-                  label="统计数据"
-                  width="80"
-                >
-                </el-table-column>
-                <el-table-column
-                  prop="statisticType"
-                  label="统计类型"
-                  width="50"
-                >
-                </el-table-column>
-                <el-table-column
-                  label="操作"
-                  align="center"
-                  class-name="small-padding fixed-width"
-                >
-                  <template slot-scope="scope">
-                    <el-dropdown>
-                      <el-button type="warning" plain size="small">
-                        处理<i class="el-icon-arrow-down el-icon--right"></i>
-                      </el-button>
-                      <el-dropdown-menu slot="dropdown">
-                        <el-dropdown-item>
-                          <el-button
-                            size="mini"
-                            type="text"
-                            icon="el-icon-edit"
-                            @click="handleUpdateStat(scope.row)"
-                            >修改
-                          </el-button>
-                        </el-dropdown-item>
-                        <el-dropdown-item>
-                          <el-button
-                            size="mini"
-                            type="text"
-                            icon="el-icon-delete"
-                            @click="handleDeleteStat(scope.row)"
-                            >删除
-                          </el-button>
-                        </el-dropdown-item>
-                      </el-dropdown-menu>
-                    </el-dropdown>
-                  </template>
-                </el-table-column>
-              </el-table>
             </el-card>
           </el-tab-pane>
         </el-tabs>
@@ -702,11 +735,11 @@
             <el-option
               v-for="item in dataArr"
               :key="item.id"
-              :label="item.fieldName"
+              :label="item.fieldDescription"
               :value="item.tableName + '.' + item.fieldName"
             >
               <span style="float: left; margin-right: 5px"
-                >{{ isShowTableName }}
+                >{{ item.fieldDescription }}
               </span>
               <span style="float: right; color: #8492a6; font-size: 13px">{{
                 item.fieldName
@@ -1053,8 +1086,10 @@ export default {
       return this.countFieldList;
     },
     // 表格主键
-    primaryKeyList() {
-      return this.tableFieldList.filter((item) => !item.isChildren);
+    primaryKeyList: {
+      get() {
+        return this.tableFieldList.filter((item) => !item.isChildren);
+      },
     },
     // 数据统计表格主键
     countPrimaryKeyList() {
@@ -1196,6 +1231,7 @@ export default {
     // 数据统计字段
     statusFieldListHandler(list) {
       this.statusFieldList = list;
+      this.countFieldList = list;
     },
     // 关联子表
     subFormDataHandler(data) {
@@ -1694,7 +1730,7 @@ export default {
       return sql;
     },
     // 数据统计sql
-    countGetSQLStr() {
+    countGetSQLStr(countByFieldList, tableName) {
       let prefix = "{DBNAME}.";
       let sqlType = this.databaseType; //数据库类型
       // let sqlType = "oracle";
@@ -1703,8 +1739,9 @@ export default {
       sql += "SELECT ";
       let fieldNameArr = [],
         relaTypeArr = [];
+      console.log(countByFieldList);
       this.getSQLCountString(
-        this.countByFieldList,
+        countByFieldList,
         fieldNameArr,
         relaTypeArr,
         sqlType
@@ -1716,9 +1753,9 @@ export default {
         " FROM " +
         isNeedUsername +
         prefix +
-        this.countData.countName +
+        tableName +
         asOrSpace +
-        this.countData.countName;
+        tableName;
       if (relaTypeArr.length) {
         sql += " " + relaTypeArr.join(" ");
       }
@@ -1989,9 +2026,11 @@ export default {
             echoData: JSON.stringify(echoData),
             conditionDefaultValueMap: conditionDefault,
           };
+          console.log(tableList1.tableKey, this.formData.btnGroupList);
           // 基础信息绑定按钮
           tableList1.dragTableBtnRelevanceList = this.getBtnMapList(
-            tableList1.tableKey
+            tableList1.tableKey,
+            this.formData.btnGroupList
           );
 
           // 关联子表回显
@@ -2037,6 +2076,7 @@ export default {
             primaryKey: this.subformData.primaryKey,
             orderByColumn: this.subformData.orderByColumn,
             sortOrder: this.subformData.isAsc,
+            statisticTitle: this.subformData.title,
             sqlKey: uuidv4(),
             dtColumnName: columns2, //列字
             timeFormat: this.subformData.timeFormate,
@@ -2045,13 +2085,15 @@ export default {
             echoData: JSON.stringify(echoData2),
             conditionDefaultValueMap: subCondition,
           };
-
+          console.log(2, tableList2.tableKey, this.subformData.btnGroupList);
           tableList2.dragTableBtnRelevanceList = this.getBtnMapList(
-            tableList2.tableKey
+            tableList2.tableKey,
+            this.subformData.btnGroupList
           );
 
           // 统计信息
           let countData = this.$refs.StatusTable?.getTableInfo();
+
           let countEchoData = {
             formData: this.countData,
             // tableFieldData: this.countFieldList,
@@ -2077,7 +2119,7 @@ export default {
           let countTableList = {
             tId: this.tId,
             tableKey: countTableKey, //  暂定
-            dtTableName: this.countData.countName,
+            dtTableName: countData.tableName,
             primaryKey: this.countData.primaryKey,
             orderByColumn: "",
             sortOrder: "",
@@ -2085,12 +2127,18 @@ export default {
             dtColumnName: "", //列字
             timeFormat: "",
             searchFieldList: countFieldLists, //搜索字段数组
-            tableSql: this.countGetSQLStr(),
+            tableSql: this.countGetSQLStr(
+              countData.fieldInfo,
+              countData.tableName
+            ),
             echoData: JSON.stringify(countEchoData),
             conditionDefaultValueMap: conutCondition,
           };
+          // return;
+          console.log(3, countTableList.tableKey, this.countData.btnGroupList);
           countTableList.dragTableBtnRelevanceList = this.getBtnMapList(
-            countTableList.tableKey
+            countTableList.tableKey,
+            this.countData.btnGroupList
           );
           let stateSqlkey = uuidv4();
           let stateList = [
@@ -2102,14 +2150,22 @@ export default {
             },
           ];
           let stateSql;
-          let stateSqlList;
+          let stateSqlList = [];
           let stateName = "";
           // console.log(this.dragTableList)
           // console.log(this.dragTableList);
           // 统计状态信息
           let search = [];
           let conditionDefaultValueMap = {};
+          stateSqlList.push({
+            sqlKey: stateSqlkey,
+            tableSql: this.getCountSqlStr(
+              this.countGetSQLStr(countData.fieldInfo, countData.tableName),
+              countData.tableName
+            ),
+          });
           this.dragTableList.forEach(async (item) => {
+            console.log(item.dtName, this.countData.relytableName);
             if (item.dtName == this.countData.relytableName) {
               // console.log(123);
               const info = await dragTableInfo({
@@ -2138,7 +2194,7 @@ export default {
               stateName = item.dtTableName;
             }
           });
-
+          // return;
           // 统计信息
           this.dragTableStatisticList.forEach((item) => {
             if (this.tId == "") {
@@ -2178,21 +2234,35 @@ export default {
             tableList1.sqlKey = this.editData.sqlKey;
             tableList1.tableKey = this.editData.tableKey;
             tableList1.tId = this.lists[0].tId;
+            console.log(tableList1.dragTableBtnRelevanceList);
+            let btnTempList1 = tableList1.dragTableBtnRelevanceList.map(
+              (item) => item.btnKey
+            );
             tableList1.dragTableBtnRelevanceList = this.getBtnMapList(
-              this.editData.tableKey
+              this.editData.tableKey,
+              btnTempList1
             );
             // 关联子表
             tableList2.tableKey = this.subEchoData.tableKey;
             tableList2.sqlKey = this.subEchoData.sqlKey;
             tableList2.tId = this.lists[1].tId;
+            let btnTempList2 = tableList2.dragTableBtnRelevanceList.map(
+              (item) => item.btnKey
+            );
             tableList2.dragTableBtnRelevanceList = this.getBtnMapList(
-              this.subEchoData.tableKey
+              this.subEchoData.tableKey,
+              btnTempList2
             );
             // 数据统计
+            console.log(this.countEchoData);
             countTableList.tableKey = this.countEchoData.tableKey;
             countTableList.sqlKey = this.countEchoData.sqlKey;
+            let btnTempList3 = countTableList.dragTableBtnRelevanceList.map(
+              (item) => item.btnKey
+            );
             countTableList.dragTableBtnRelevanceList = this.getBtnMapList(
-              this.countEchoData.tableKey
+              this.countEchoData.tableKey,
+              btnTempList3
             );
             countTableList.tId = this.lists[2].tId;
 
@@ -2219,6 +2289,7 @@ export default {
                 sort: 2,
               }
             );
+            console.log(countTableList.tableKey);
             data.groupTableInfo = JSON.stringify(data.groupTableInfo);
             data.dragTables.push(tableList1, tableList2, countTableList);
 
@@ -2228,7 +2299,7 @@ export default {
               item.tableKey = this.subEchoData.tableKey;
             });
 
-            // console.log('回显', this.statusCount);
+            console.log("回显", this.statusCount);
             stateList.forEach((item) => {
               item.id = this.statusCount.id;
               item.sqlKey = this.statusCount.sqlKey;
@@ -2239,11 +2310,13 @@ export default {
               item.sqlKey = this.statusCount.sqlKey;
             });
             // 修改统计数据
+
             await updateStatistic({
               tableKey: this.subEchoData.tableKey,
               dragTableStatisticList: this.dragTableStatisticList,
               tableSqlList: this.tableSqlList,
               searchFieldList: searchFieldList2,
+              conditionDefaultValueMap: subCondition,
               dtTableName: this.subTableName,
             });
 
@@ -2252,9 +2325,9 @@ export default {
               tableKey: this.countEchoData.tableKey,
               dragTableStatisticList: stateList,
               tableSqlList: stateSqlList,
-              searchFieldList: search,
+              searchFieldList: countFieldLists,
               dtTableName: stateName,
-              conditionDefaultValueMap: conditionDefaultValueMap,
+              conditionDefaultValueMap: conutCondition,
             });
           } else {
             // 统计信息
@@ -2276,7 +2349,7 @@ export default {
               groupDescription: this.formData.groupDescription,
               groupTableInfo: [],
               dragTables: [],
-              templateType: "myTemplateType",
+              templateType: "composeForm",
             };
             data.groupTableInfo.push(
               {
@@ -2297,22 +2370,23 @@ export default {
 
             res = await addDialogGroup(data);
             //  统计数据
-            addStatistic({
+            await addStatistic({
               tableKey: tableList2.tableKey,
               dragTableStatisticList: this.dragTableStatisticList,
               tableSqlList: this.tableSqlList,
               searchFieldList: searchFieldList2,
               dtTableName: this.subTableName,
+              conditionDefaultValueMap: subCondition,
             });
-
+            console.log(stateList);
             // 统计状态
-            addStatistic({
+            await addStatistic({
               tableKey: countTableList.tableKey,
               dragTableStatisticList: stateList,
               tableSqlList: stateSqlList,
-              searchFieldList: search,
+              searchFieldList: countFieldLists,
               dtTableName: stateName,
-              conditionDefaultValueMap: conditionDefaultValueMap,
+              conditionDefaultValueMap: conutCondition,
             });
           }
 
@@ -2340,9 +2414,22 @@ export default {
         }
       });
     },
+    // 获取数据统计的sql
+    getCountSqlStr(sql, tableName) {
+      let tempList = sql.split("FROM");
+      return (
+        "SELECT " +
+        tableName +
+        "." +
+        this.countData.countFile +
+        " as result " +
+        " FROM" +
+        tempList[1]
+      );
+    },
     // 按钮
-    getBtnMapList(tableKey) {
-      let res = this.formData.btnGroupList.map((item) => {
+    getBtnMapList(tableKey, btnGroupList) {
+      let res = btnGroupList.map((item) => {
         return {
           tableKey,
           btnKey: item,
@@ -2355,7 +2442,7 @@ export default {
       this.$forceUpdate(); //强制刷新
     },
     // 处理统计sql语句
-    getTableSql(sql, key) {
+    getTableSql(sql, key, tableName) {
       // console.log(key);
       let Sql;
       let arrSql = sql.split("FROM");
@@ -2379,7 +2466,7 @@ export default {
           console.log("zidaun", this.countData.countFile);
           Sql =
             "SELECT " +
-            this.countData.countName +
+            tableName +
             "." +
             this.countData.countFile +
             " as result " +
@@ -2444,15 +2531,15 @@ export default {
             this.dragTableStatisticList = res.data.dragTableStatisticList;
           } else if (item.tableKey == groupInfo[2].tableKey) {
             let res = await getTableInfo(item.tId);
-            // console.log('统计', res.data);
+            console.log("统计", res.data);
             this.statusCount = res.data.dragTableStatisticList[0];
+            console.log(this.statusCount);
 
             // console.log('zhuangt', res);
             let echoData = JSON.parse(item.echoData);
             this.countFieldList = echoData.tableFieldData;
-            // console.log('echo123', echoData);
 
-            this.countData.title = this.statusCount.statisticTitle;
+            this.countData.title = this.statusCount?.statisticTitle;
             // this.countData.relaykey = this.statusCount.statisticField
             this.countEchoData = item;
             console.log(JSON.parse(this.countEchoData.echoData));
@@ -2480,19 +2567,20 @@ export default {
           await this.getdragTable();
         });
 
-        this.getrelyList();
+        // this.getrelyList();
 
-        this.getCountrelyList();
+        // this.getCountrelyList();
       } else {
         this.$message.error("数据回显失败");
       }
     },
+
     // tab切换
     tabhandleClick(tab, event) {
       this.tabIndex = tab.index;
       console.log(this.tabIndex);
       if (this.tabIndex == "2") {
-        this.getCountrelyList();
+        // this.getCountrelyList();
       }
       this.menudata = this.activeName != "menuedit" ? true : false;
     },

ruoyi-ui/src/views/dialogMange/relayTableMange/tablelist.vue

@@ -192,6 +192,7 @@ export default {
     "tableList",
     "btnGroupOptions",
     "echoData",
+    "tableListName",
   ],
   components: { Queryfrom, Treeselect, RelayDialog },
   data() {

ruoyi-ui/src/views/dialogTemplate/components/NodeInfoDialog.vue

@@ -171,7 +171,16 @@ export default {
       controlBtnArr: [],
     };
   },
-  props: ["groupKey", "rowobj", "tableCount", "subCount", "subTableName"],
+  props: [
+    "groupKey",
+    "rowobj",
+    "tableCount",
+    "subCount",
+    "subTableName",
+    "task_plan_key",
+    "task_key",
+    "task_node_key",
+  ],
   computed: {
     isShowExcuteCol() {
       return !this.excuteBtnArr?.every((arr) => arr.children.length == 0);

ruoyi-ui/src/views/dialogTemplate/components/index.vue

@@ -111,6 +111,10 @@ import {
 } from "@/api/tablelist/commonTable";
 import { camelCase } from "@/utils";
 import Menu from "@/views/tablelist/commonTable/BtnMenu.vue";
+import {
+  getProcessPopupTableInfo,
+  getProcessPopupTableList,
+} from "@/api/dragform/form"; //新的弹窗数据请求
 
 export default {
   components: { Menu },
@@ -194,9 +198,12 @@ export default {
       });
     },
     // 获取弹窗信息
-    async getLists(groupKey) {
-      let res = await dragGroupTableInfo({ queryMap: { groupKey: groupKey } });
+    async getLists(payload) {
+      // let res = await dragGroupTableInfo({ queryMap: { groupKey: groupKey } });
+      let resTableInfo = await getProcessPopupTableInfo({ queryMap: payload });
+      let resTableData = await getProcessPopupTableList({ queryMap: payload });
       // 获取表格tablekey 和 sort
+      console.log(resTableData);
       this.tableLists = JSON.parse(res.msg);
 
       this.tableLists.forEach(async (item) => {

ruoyi-ui/src/views/system/bpmnPro/components/Panel/components/ElementExecuteForm.vue

@@ -67,7 +67,10 @@ export default {
   },
   methods: {
     async initFormData() {
-      this.formKey = [getNodeFormType(getActive()), getFormKey(getActive())];
+      this.formKey = [
+        getNodeFormType(getActive()),
+        Number(getFormKey(getActive())),
+      ];
     },
     updateFormKey(value) {
       setNodeFormType(getActive(), value[0]);

ruoyi-ui/src/views/system/bpmnPro/components/Panel/components/ElementNormalTask.vue

@@ -106,7 +106,12 @@ export default {
   methods: {
     async initFormData() {
       this.industryType = getIndustryType(getActive());
-      await this.getScriptList(this.industryType);
+      console.log(typeof this.industryType);
+      if (this.industryType) {
+        console.log("NormalTask");
+        await this.getScriptList(this.industryType);
+      }
+
       this.normalScriptKey = getNormalScriptKey(getActive());
       // this.scriptTriggerType = getNormalScriptTriggerType(getActive());
     },

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

@@ -358,7 +358,6 @@ export function getNormalScriptTriggerType(element) {
 export function getNodeExecuteType(element) {
   const prefix = getProcessEngine();
   const businessObject = getBusinessObject(element);
-  console.log(businessObject.id, businessObject.get(`${prefix}:nodeExecuteType`));
   return businessObject.get(`${prefix}:nodeExecuteType`);
 }
 

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

@@ -646,25 +646,33 @@ export default {
         //   label: "脚本",
         // },
         {
-          value: "6",
+          // value: "6",
+          value: "DIRECTORY",
           label: "目录",
         },
         {
-          value: "7",
+          // value: "7",
+          value: "OUTLINK",
           label: "外链",
         },
         {
-          value: "3",
+          // value: "3",
+          value: "INNERLINK",
           label: "内链",
         },
         {
-          value: "8",
+          // value: "8",
+          value: "UPDATE",
           label: "修改",
         },
         {
-          value: "9",
+          value: "DELETE",
           label: "删除",
         },
+        {
+          value: "INSERT",
+          label: "新增",
+        },
       ],
       formOptions: [],
       tableOptions: [],

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

@@ -362,7 +362,7 @@
               <!-- <el-table-column prop="type" label="类型" width="50"> -->
               <el-table-column prop="statisticType" label="统计类型" width="50">
               </el-table-column>
-             
+
               <el-table-column
                 label="操作"
                 align="center"
@@ -1543,7 +1543,7 @@ export default {
           this.tableKey = uuidv4();
           // 表单
           let result;
-          if (this.tId) {
+          if (this.tId && this.menuId) {
             let payLoad = {
               menuId: this.menuId,
               menuName: this.formData.menuName,
@@ -1634,10 +1634,10 @@ export default {
               });
               this.searchFieldList = searchFieldList;
             });
-            
+
             let res;
             let res1;
-            if (this.tId) {
+            if (this.tId && this.menuId) {
               data.menuId = this.menuId;
               data.sqlKey = this.editData.sqlKey;
               data.tableKey = this.editData.tableKey;

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

@@ -279,7 +279,7 @@
       </span>
     </el-dialog>
 
-    <!-- 绑定按钮dialog -->
+    <!-- 自定义弹窗 -->
     <el-dialog
       title="提示"
       :visible.sync="btnDialogVisible"
@@ -713,7 +713,7 @@ export default {
       try {
         let payLoad = {
           basicMap: {
-            btnType: 8,
+            btnType: UPDATE,
             btnKey: this.currentBtnData.btnKey,
             visible: "false",
             sqlKey: this.templateInfo.template.sqlKey,
@@ -1103,10 +1103,10 @@ export default {
             Object.keys(values).map((k) => {
               data.commMap[k] = values[k];
             });
-            data.basicMap.btnType = 8;
+            data.basicMap.btnType = "UPDATE";
             data.basicMap.visible = true;
           } else {
-            data.basicMap.btnType = 10;
+            data.basicMap.btnType = "INSERT";
             data.basicMap.visible = true;
           }
           try {
@@ -1309,7 +1309,7 @@ export default {
         url += "?" + tempArr.join("&");
       }
       // let link = btnData.btnParams;
-      if (type == "3") {
+      if (type == "INNERLINK") {
         this.$router.push(url);
       } else {
         window.open("http://" + url, "_blank");
@@ -1321,19 +1321,17 @@ export default {
       let { btnType, btnParams } = btnData;
       this.currentBtnData = btnData;
       this.currentRow = JSON.parse(JSON.stringify(row));
-      switch (
-        btnType //3:内链  6:目录  7:外链  8:修改  9:删除
-      ) {
-        case "3":
+      switch (btnType) {
+        case "INNERLINK":
           this.routerHandler(btnData, btnType);
           break;
-        case "7":
+        case "OUTLINK":
           this.routerHandler(btnData, btnType);
           break;
-        case "8":
+        case "UPDATE":
           this.handleUpdate(row, btnData);
           break;
-        case "9":
+        case "DELETE":
           this.handleDelete(row, btnData);
           break;
         default: