fix:bug修改,代码同步

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

@@ -443,6 +443,31 @@ export default {
       },
       deep: true,
     },
+    mySelectItem: {
+      handler(nval) {
+        console.log(nval);
+        if (
+          nval.options.sqlData &&
+          nval.options.sqlData.dynamicName == nval.options.dynamicKey
+        ) {
+          this.btnList = nval.options.sqlData.echoDatas.map((item) => {
+            return {
+              sql: "",
+              echoData: item,
+            };
+          });
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
+    myOptions: {
+      handler(nval) {
+        console.log("options", nval);
+      },
+      deep: true,
+      immediate: true,
+    },
   },
   computed: {
     ...mapState({
@@ -455,6 +480,12 @@ export default {
     myDynamicKey() {
       return this.dynamicKey;
     },
+    mySelectItem() {
+      return this.selectItem;
+    },
+    myOptions() {
+      return this.options;
+    },
   },
   methods: {
     // 添加一级回调
@@ -467,6 +498,24 @@ export default {
     minusHandler() {
       this.btnList.pop();
     },
+    reset() {
+      Object.assign(this.formData, {
+        dynamicName: "", //英文字符串
+        tableName: "",
+        optLabelData: "",
+        optValueData: "",
+      });
+      this.filterTableData = [];
+      Object.assign(this.flagFormData, {
+        flagType: 0,
+        tableField: {
+          tableName: "",
+          fieldName: "",
+          fieldOptions: [],
+        },
+        flagValue: "",
+      });
+    },
 
     // 重置条件表单数据
     resetFlagFormData() {
@@ -507,6 +556,7 @@ export default {
     },
     // 弹窗取消回调
     cancleHandler() {
+      this.reset();
       this.isShow = false;
     },
     // 弹窗确认回调
@@ -533,8 +583,9 @@ export default {
       sqlData.sqls = this.btnList.map((item) => item.sql);
       sqlData.echoDatas = this.btnList.map((item) => item.echoData);
       this.$emit("setDynamicKey", sqlData);
-
       console.log(sql);
+      this.reset();
+
       this.isShow = false;
     },
     // 获取所有表格
@@ -602,15 +653,15 @@ export default {
   },
   async mounted() {
     console.log(this.options, this.selectItem);
-    if (this.selectItem.options.sqlData) {
-      this.btnList = this.selectItem.options.sqlData.echoDatas.map((item) => {
-        return {
-          sql: "",
-          echoData: item,
-        };
-      });
-      console.log(this.btnList);
-    }
+    // if (this.selectItem.options.sqlData) {
+    //   this.btnList = this.selectItem.options.sqlData.echoDatas.map((item) => {
+    //     return {
+    //       sql: "",
+    //       echoData: item,
+    //     };
+    //   });
+    //   console.log(this.btnList);
+    // }
   },
 };
 </script>

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

@@ -8,7 +8,7 @@
             <span class="title">我的处理</span>
             <span class="sub-title">需要我处理的管道</span>
           </div>
-          <span class="data">10</span>
+          <span class="data">{{ tableData.length }}</span>
         </div>
       </el-col>
       <el-col :xs="24" :md="8" :xl="8" class="col">
@@ -26,7 +26,7 @@
             <span class="title">完成</span>
             <span class="sub-title">已经完成的管道</span>
           </div>
-          <span class="data">4</span>
+          <span class="data">0</span>
         </div>
       </el-col>
     </el-row>

ruoyi-ui/src/views/system/bpmnPro/components/Toolbar/tools/Save.vue

@@ -194,6 +194,10 @@ export default {
       });
       try {
         let res = await addConfiguration(data);
+        this.$tab.closePage();
+        this.$router.push({
+          path: "/processModeling/process",
+        });
       } catch (error) {
         console.log(error);
       }
@@ -210,6 +214,10 @@ export default {
       });
       try {
         let res = await updateConfiguration(theData);
+        this.$tab.closePage();
+        this.$router.push({
+          path: "/processModeling/process",
+        });
       } catch (error) {
         console.log(error);
       }

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

@@ -196,7 +196,6 @@ const blackArr = [
   "definitions",
   "process",
   "startEvent",
-  "outgoing",
   "unusualTask",
   "extensionElements",
   // "task",
@@ -204,27 +203,13 @@ const blackArr = [
   "outgoing",
   "sequenceFlow",
   "endEvent",
-  "incoming",
-  "sequenceFlow",
   "BPMNDiagram",
   "BPMNPlane",
   "BPMNShape",
-  "Bounds",
-  "BPMNLabel",
-  "Bounds",
-  "BPMNShape",
-  "Bounds",
-  "BPMNLabel",
-  "BPMNShape",
-  "Bounds",
   "BPMNLabel",
   "Bounds",
   "BPMNEdge",
   "waypoint",
-  "waypoint",
-  "BPMNEdge",
-  "waypoint",
-  "waypoint",
   "property",
   "properties"
 ]

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

@@ -609,7 +609,7 @@ export default {
         btnName: "", //按钮显示的文字
         btnIcon: "", //按钮图标
         btnType: 6, //0:操作按钮，1，其他，2表单，3内链，4流程，5脚本, 6,目录, 7:外链
-        btnFormKey: "", //表单唯一标识
+        btnFormKey: null, //表单唯一标识
         btnProcessKey: "", //流程唯一标识
         btnTableKey: "", //表格唯一标识
         btnScriptKey: "", //脚本唯一标识
@@ -738,7 +738,6 @@ export default {
           this.rootFieldInfo.fieldList = this.columnsHandler(
             JSON.parse(tableInfo.data.resultMap.template.dtColumnName)
           );
-          console.log(this.rootFieldInfo.fieldList);
         }
       }
     },
@@ -783,9 +782,7 @@ export default {
 
       listBtn(this.queryParams).then((response) => {
         let res = this.setRootBtnKey(response.rows);
-        console.log(res);
         this.btnList = res;
-        console.log("btnList", this.btnList);
         this.loading = false;
       });
     },
@@ -816,8 +813,6 @@ export default {
           let _this = this;
           let res = response.rows.filter((node) => _this.getAllMenuList(node));
           btnTemp.children.push(...res);
-          console.log(btnTemp);
-
           this.menuOptions.push(btnTemp);
         }
       );
@@ -851,7 +846,7 @@ export default {
         btnName: "", //按钮显示的文字
         btnIcon: "", //按钮图标
         btnType: "6", //0:操作按钮，1，其他，2表单，3跳转，4流程，5脚本
-        btnFormKey: "", //表单唯一标识
+        btnFormKey: null, //表单唯一标识
         btnProcessKey: "", //流程唯一标识
         btnTableKey: "", //表格唯一标识
         btnScriptKey: "", //脚本唯一标识
@@ -899,7 +894,6 @@ export default {
     },
     /** 修改按钮操作 */
     async handleUpdate(row) {
-      console.log(row);
       this.reset();
       this.getTreeselect();
       this.editType = false;
@@ -1011,6 +1005,9 @@ export default {
         //获取表单选项数据
         let formRes = await listForm({ isEnablePaging: false });
         if (formRes.code == 200) {
+          formRes.rows.forEach((item) => {
+            item.fId = item.fId.toString();
+          });
           this.formOptions = formRes.rows;
         } else {
           this.$message.error("网络异常请稍后再试");

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

@@ -118,6 +118,10 @@ export default {
         }).then((res) => {
           console.log(res);
           this.$message(res.msg);
+          this.$tab.closePage();
+          this.$router.push({
+            path: "/system/fromModel/index/dragform",
+          });
         });
       } else {
         updateForm({
@@ -135,6 +139,10 @@ export default {
         }).then((res) => {
           console.log(res);
           this.$message(res.msg);
+          this.$tab.closePage();
+          this.$router.push({
+            path: "/system/fromModel/index/dragform",
+          });
         });
       }
     },

ruoyi-ui/src/views/system/tenant/code/index.vue

@@ -167,7 +167,7 @@ export default {
       //表单校验
       rulesActivationCode: {
         tenantCode: [
-          { required: true, message: "未选择租户信息", trigger: "blur" },
+          { required: true, message: "未选择租户信息", trigger: "change" },
         ],
         tenantExpirationDate: [
           { required: true, message: "租户到期时间未设置", trigger: "blur" },

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

@@ -1710,16 +1710,20 @@ export default {
             if (this.tId) {
               if (res.code == 200) {
                 this.$message.success("修改成功");
+                this.$tab.closePage();
+                this.$router.push({
+                  path: "/system/fromModel/index/tablelist",
+                });
               } else {
                 this.$message.warning("修改失败");
               }
-              this.$tab.closePage();
-              this.$router.push({
-                path: "/system/fromModel/index/tablelist",
-              });
             } else {
               if (res.code == 200) {
                 this.$message.success("创建成功");
+                this.$tab.closePage();
+                this.$router.push({
+                  path: "/system/fromModel/index/tablelist",
+                });
               } else {
                 this.$message.warning("创建失败");
               }

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

@@ -389,8 +389,6 @@ 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);
     },
   },

ruoyi-ui/vue.config.js

@@ -8,9 +8,7 @@ const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-// const name = process.env.VUE_APP_TITLE || '后台管理系统' // 网页标题
-const name = 'wu' // 网页标题
-
+const name = process.env.VUE_APP_TITLE || '后台管理系统' // 网页标题
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 const isDev = process.env.NODE_ENV !== "production";
 // vue.config.js 配置说明
@@ -39,7 +37,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.110.76:8080`,
+        target: `http://192.168.110.59:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''