Merge branch 'master' of http://49.233.37.222:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

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

@@ -1,5 +1,4 @@
 import request from '@/utils/request'
-
 // 查询动态格列表
 export function listTable(query) {
   return request({
@@ -17,4 +16,13 @@ export function dragTableList(query) {
     params: query,
     baseURL: process.env.VUE_APP_BASE_API3
   })
+}
+// 删除表格列表
+export function removeTableList(data) {
+  return request({
+    url: '/system/table/remove',
+    method: 'delete',
+    data: data,
+    baseURL: process.env.VUE_APP_BASE_API3
+  })
 }

ruoyi-ui/src/assets/styles/sidebar.scss

@@ -119,7 +119,7 @@
 
     .submenu-title-noDropdown {
       position: relative;
-
+      padding: 0 !important;
       .el-tooltip {
         padding: 0 !important;
 

ruoyi-ui/src/layout/components/Sidebar/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div
+    @mouseleave="mouseleaveHandler"
     :class="{ 'has-logo': showLogo }"
     :style="{
       backgroundColor:
@@ -9,7 +10,10 @@
     }"
   >
     <logo v-if="showLogo" :collapse="isCollapse" />
-    <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
+    <el-scrollbar 
+    :class="settings.sideTheme" 
+    wrap-class="scrollbar-wrapper"
+    >
       <el-menu
         :default-active="activeMenu"
         :collapse="isCollapse"
@@ -80,6 +84,9 @@ export default {
     },
   },
   methods: {
+    mouseleaveHandler() {
+      console.log(123);
+    },
     onLayoutResize() {
       // const clientWidth = document.documentElement.clientWidth;
       const rect = document.body.getBoundingClientRect();
@@ -91,7 +98,7 @@ export default {
         this.isCollapse = false;
       }
       console.log(this.isCollapse);
-    },
+    }
   },
   mounted() {
     // window.addEventListener("resize", this.onLayoutResize);

ruoyi-ui/src/main.js

@@ -7,6 +7,13 @@ import Cookies from 'js-cookie'
 import Element from 'element-ui'
 import './assets/styles/element-variables.scss'
 
+// 以下为bpmn工作流绘图工具的样式
+import 'bpmn-js/dist/assets/diagram-js.css' // 左边工具栏以及编辑节点的样式
+import 'bpmn-js/dist/assets/bpmn-font/css/bpmn.css'
+import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css'
+import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css'
+
+
 import '@/assets/styles/index.scss' // global css
 import '@/assets/styles/ruoyi.scss' // ruoyi css
 import App from './App'

ruoyi-ui/src/router/index.js

@@ -72,6 +72,24 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/bpmn',
+    component: Layout,
+    hidden: true,
+    name: 'bpmn',
+    meta: {
+      title: "流程图",
+      icon: "form",
+      noCache: false,
+      link: null
+    },
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/system/bpmn/index.vue'),
+      }
+    ]
+  },
   {
     path: '/login',
     component: () => import('@/views/login'),

ruoyi-ui/src/views/dragform/tableList.vue

@@ -86,7 +86,7 @@
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
-
+  
     <el-table
       v-loading="loading"
       :data="tableList"
@@ -107,7 +107,8 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
-          <el-button
+          <!-- 修改样式 -->
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -120,7 +121,34 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             >删除</el-button
-          >
+          > -->
+
+          <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="handleUpdate(scope.row)"
+                  >修改
+                </el-button>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.row)"
+                  >删除
+                </el-button>
+              </el-dropdown-item>
+             
+            </el-dropdown-menu>
+          </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
@@ -195,7 +223,8 @@
   </div>
 </template>
 <script>
-import { listTable } from "@/api/dragform/tableList";
+import { listTable, removeTableList } from "@/api/dragform/tableList";
+import DictData from "@/components/DictData";
 
 export default {
   name: "Table",
@@ -205,6 +234,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      Keys: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -295,6 +325,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.tId);
+      this.Keys = selection.map((item) => item.sqlKey);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -347,11 +378,19 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const tIds = row.tId || this.ids;
-      this.$modal
-        .confirm('是否确认删除动态格编号为"' + tIds + '"的数据项？')
-        .then(function () {
-          return delTable(tIds);
+      let data = {};
+      if (row.tId && row.sqlKey) {
+        data.tIds = [row.tId];
+        data.sqlKeys = [row.sqlKey];
+      } else {
+        data.tIds = this.ids;
+        data.sqlKeys = this.Keys;
+      }
+      // console.log(data);
+      this.$modal.confirm('是否确认删除动态格编号为"' + data.tIds.join(',') + '"的数据项？')
+        .then(async function () {
+          const res = await removeTableList(data)
+          // console.log(res);
         })
         .then(() => {
           this.getList();

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

@@ -0,0 +1,72 @@
+<template>
+  <div class="containers">
+    <div class="canvas" ref="canvas"></div>
+  </div>
+</template>
+<script>
+// 引入相关的依赖
+import BpmnModeler from "bpmn-js/lib/Modeler";
+import { xmlStr } from "./mock/xmlStr"; // 这里是直接引用了xml字符串
+export default {
+  name: "",
+  components: {},
+  // 生命周期 - 创建完成（可以访问当前this实例）
+  created() {},
+  // 生命周期 - 载入后, Vue 实例挂载到实际的 DOM 操作完成，一般在该过程进行 Ajax 交互
+  mounted() {
+    this.init();
+  },
+  data() {
+    return {
+      // bpmn建模器
+      bpmnModeler: null,
+      container: null,
+      canvas: null,
+    };
+  },
+  methods: {
+    init() {
+      // 获取到属性ref为“canvas”的dom节点
+      const canvas = this.$refs.canvas;
+      // 建模
+      this.bpmnModeler = new BpmnModeler({
+        container: canvas,
+      });
+      this.createNewDiagram();
+    },
+    createNewDiagram() {
+      // 将字符串转换成图显示出来
+      this.bpmnModeler.importXML(xmlStr, (err) => {
+        if (err) {
+          // console.error(err)
+        } else {
+          // 这里是成功之后的回调, 可以在这里做一系列事情
+          this.success();
+        }
+      });
+    },
+    success() {
+      // console.log('创建成功!')
+    },
+  },
+};
+</script>
+
+<style scoped>
+.containers {
+  position: absolute;
+  background-color: #ffffff;
+  width: 100%;
+  height: 100%;
+}
+.canvas {
+  width: 100%;
+  height: 100%;
+}
+.panel {
+  position: absolute;
+  right: 0;
+  top: 0;
+  width: 300px;
+}
+</style>

ruoyi-ui/src/views/system/bpmn/mock/xmlStr.js

@@ -0,0 +1,62 @@
+export default '<?xml version="1.0" encoding="UTF-8"?>\n' +
+  '<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_0fppxr8" targetNamespace="http://bpmn.io/schema/bpmn">\n' +
+  '  <bpmn:process id="Process_1" isExecutable="false">\n' +
+  '    <bpmn:startEvent id="StartEvent_1" name="begin&#10;">\n' +
+  '      <bpmn:outgoing>SequenceFlow_0nrfbee</bpmn:outgoing>\n' +
+  '    </bpmn:startEvent>\n' +
+  '    <bpmn:task id="Task_0ho18x0" name="hello&#10;">\n' +
+  '      <bpmn:incoming>SequenceFlow_0nrfbee</bpmn:incoming>\n' +
+  '      <bpmn:outgoing>SequenceFlow_00ho26x</bpmn:outgoing>\n' +
+  '    </bpmn:task>\n' +
+  '    <bpmn:task id="Task_1ymuvem" name="world">\n' +
+  '      <bpmn:incoming>SequenceFlow_00ho26x</bpmn:incoming>\n' +
+  '      <bpmn:outgoing>SequenceFlow_18df8vb</bpmn:outgoing>\n' +
+  '    </bpmn:task>\n' +
+  '    <bpmn:endEvent id="EndEvent_1c0ed2n" name="end">\n' +
+  '      <bpmn:incoming>SequenceFlow_18df8vb</bpmn:incoming>\n' +
+  '    </bpmn:endEvent>\n' +
+  '    <bpmn:sequenceFlow id="SequenceFlow_0nrfbee" sourceRef="StartEvent_1" targetRef="Task_0ho18x0" />\n' +
+  '    <bpmn:sequenceFlow id="SequenceFlow_00ho26x" sourceRef="Task_0ho18x0" targetRef="Task_1ymuvem" />\n' +
+  '    <bpmn:sequenceFlow id="SequenceFlow_18df8vb" sourceRef="Task_1ymuvem" targetRef="EndEvent_1c0ed2n" />\n' +
+  '  </bpmn:process>\n' +
+  '  <bpmndi:BPMNDiagram id="BPMNDiagram_1">\n' +
+  '    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1">\n' +
+  '      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">\n' +
+  '        <dc:Bounds x="173" y="102" width="36" height="36" />\n' +
+  '        <bpmndi:BPMNLabel>\n' +
+  '          <dc:Bounds x="178" y="145" width="27" height="27" />\n' +
+  '        </bpmndi:BPMNLabel>\n' +
+  '      </bpmndi:BPMNShape>\n' +
+  '      <bpmndi:BPMNShape id="Task_0ho18x0_di" bpmnElement="Task_0ho18x0">\n' +
+  '        <dc:Bounds x="485" y="244" width="100" height="80" />\n' +
+  '      </bpmndi:BPMNShape>\n' +
+  '      <bpmndi:BPMNShape id="Task_1ymuvem_di" bpmnElement="Task_1ymuvem">\n' +
+  '        <dc:Bounds x="712" y="391" width="100" height="80" />\n' +
+  '      </bpmndi:BPMNShape>\n' +
+  '      <bpmndi:BPMNShape id="EndEvent_1c0ed2n_di" bpmnElement="EndEvent_1c0ed2n">\n' +
+  '        <dc:Bounds x="1056" y="568" width="36" height="36" />\n' +
+  '        <bpmndi:BPMNLabel>\n' +
+  '          <dc:Bounds x="1065" y="611" width="19" height="14" />\n' +
+  '        </bpmndi:BPMNLabel>\n' +
+  '      </bpmndi:BPMNShape>\n' +
+  '      <bpmndi:BPMNEdge id="SequenceFlow_0nrfbee_di" bpmnElement="SequenceFlow_0nrfbee">\n' +
+  '        <di:waypoint x="209" y="120" />\n' +
+  '        <di:waypoint x="347" y="120" />\n' +
+  '        <di:waypoint x="347" y="284" />\n' +
+  '        <di:waypoint x="485" y="284" />\n' +
+  '      </bpmndi:BPMNEdge>\n' +
+  '      <bpmndi:BPMNEdge id="SequenceFlow_00ho26x_di" bpmnElement="SequenceFlow_00ho26x">\n' +
+  '        <di:waypoint x="585" y="284" />\n' +
+  '        <di:waypoint x="649" y="284" />\n' +
+  '        <di:waypoint x="649" y="431" />\n' +
+  '        <di:waypoint x="712" y="431" />\n' +
+  '      </bpmndi:BPMNEdge>\n' +
+  '      <bpmndi:BPMNEdge id="SequenceFlow_18df8vb_di" bpmnElement="SequenceFlow_18df8vb">\n' +
+  '        <di:waypoint x="812" y="431" />\n' +
+  '        <di:waypoint x="934" y="431" />\n' +
+  '        <di:waypoint x="934" y="586" />\n' +
+  '        <di:waypoint x="1056" y="586" />\n' +
+  '      </bpmndi:BPMNEdge>\n' +
+  '    </bpmndi:BPMNPlane>\n' +
+  '  </bpmndi:BPMNDiagram>\n' +
+  '</bpmn:definitions>\n'

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

@@ -238,8 +238,9 @@
         <el-form-item label="数据源类型" prop="databaseType">
           <el-select
             v-model="dataSourceForm.databaseType"
-            placeholder="请选择数据源类型"
+            :placeholder="palcemsg"
             @change="selecthandle"
+            :disabled="dataSourceType"
           >
             <el-option
               v-for="item in dict.type.datasource_type"
@@ -390,6 +391,11 @@ export default {
       },
     };
   },
+  computed: {
+    palcemsg(){
+      return this.dataSourceType ? 'mysql' : '请选择数据源类型'
+    }
+  },
   created() {
     this.getList();
   },

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

@@ -277,11 +277,11 @@
     </el-row>
     <el-dialog title="效果预览" :visible.sync="isShowPreview" width="50%">
       <el-row :gutter="10" class="mb8">
-        <el-col span="18">
+        <el-col :span=18>
           <el-input placeholder="请输入" clearable />
         </el-col>
 
-        <el-col span="6">
+        <el-col :span=6>
           <el-button
             type="primary"
             icon="el-icon-search"
@@ -370,8 +370,8 @@
           class-name="small-padding fixed-width"
         >
           <!-- <template slot-scope="scope"> -->
-          <template>
-            <el-button
+          <template slot-scope="scope">
+            <!-- <el-button
               size="mini"
               type="text"
               icon="el-icon-edit"
@@ -384,7 +384,32 @@
               icon="el-icon-delete"
               @click="() => {}"
               >删除
-            </el-button>
+            </el-button> -->
+            <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="() => {}"
+                      >修改</el-button
+                    ></el-dropdown-item
+                  >
+                  <el-dropdown-item
+                    ><el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-delete"
+                      @click="() => {}"
+                      >删除</el-button
+                    >
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
           </template>
         </el-table-column>
       </el-table>

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

@@ -131,6 +131,7 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
+<<<<<<< HEAD
           <el-button
             size="mini"
             type="text"
@@ -145,6 +146,32 @@
             @click="handleDelete(scope.row)"
           >删除
           </el-button>
+=======
+          <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="handleUpdate(scope.row)"
+                  >修改</el-button
+                ></el-dropdown-item>
+                <el-dropdown-item
+                  ><el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-delete"
+                    @click="handleDelete(scope.row)"
+                    >删除</el-button
+                  >
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+>>>>>>> 53e53a68 (修改样式和表格删除)
         </template>
       </el-table-column>
     </el-table>