修改文件名称及代码关键字/脚本编辑修改回调问题处理

ruoyi-ui/README.md

@@ -2,10 +2,10 @@
 
 ```bash
 # 克隆项目
-git clone https://gitee.com/y_project/RuoYi-Vue
+git clone https://gitee.com/y_project/zkqy-Vue
 
 # 进入项目目录
-cd ruoyi-ui
+cd zkqy-ui
 
 # 安装依赖
 npm install
@@ -27,4 +27,4 @@ npm run build:stage
 
 # 构建生产环境
 npm run build:prod
-```
+```

ruoyi-ui/src/api/system/PortalEngine.js

@@ -1,13 +1,13 @@
 import request from '@/utils/request'
-import { parseStrEmpty } from "@/utils/ruoyi";
+import { parseStrEmpty } from "@/utils/zkqy";
 
 
 //  这里的名称，需要和引入的地方，进行对应，就是一样的，
 export function getTenant(data) {
-    return request({
-      url: 'system/tenant/list',
-      method: 'get',
-      params: data,
+  return request({
+    url: 'system/tenant/list',
+    method: 'get',
+    params: data,
     //   baseURL:process.env.VUE_APP_BASE_API2
-    })
-  }
+  })
+}

ruoyi-ui/src/api/system/data.js

@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import { parseStrEmpty } from "@/utils/ruoyi";
+import { parseStrEmpty } from "@/utils/zkqy";
 
 // 查询
 export function getList(query) {
@@ -7,7 +7,7 @@ export function getList(query) {
     url: '/dataSource/list',
     method: 'get',
     params: query,
-    baseURL:process.env.VUE_APP_BASE_API2
+    baseURL: process.env.VUE_APP_BASE_API2
   })
 }
 
@@ -27,7 +27,7 @@ export function getDataSourceInfo(query) {
     url: '/dataSource/querySelectDataSource',
     method: 'get',
     params: query,
-    baseURL:process.env.VUE_APP_BASE_API2
+    baseURL: process.env.VUE_APP_BASE_API2
   })
 }
 // 校验当前数据库名称得到得到当前数据源下所有库的信息
@@ -36,7 +36,7 @@ export function insertDataSource(data) {
     url: '/tableInfo/initDatabase',
     method: 'post',
     data: data,
-    baseURL:process.env.VUE_APP_BASE_API2
+    baseURL: process.env.VUE_APP_BASE_API2
   })
 }
 

ruoyi-ui/src/api/system/user.js

@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import { parseStrEmpty } from "@/utils/ruoyi";
+import { parseStrEmpty } from "@/utils/zkqy";
 
 // 查询用户列表
 export function listUser(query) {

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

@@ -1,277 +0,0 @@
- /**
- * 通用css样式布局处理
- * Copyright (c) 2019 ruoyi
- */
-
- /** 基础通用 **/
-.pt5 {
-	padding-top: 5px;
-}
-.pr5 {
-	padding-right: 5px;
-}
-.pb5 {
-	padding-bottom: 5px;
-}
-.mt5 {
-	margin-top: 5px;
-}
-.mr5 {
-	margin-right: 5px;
-}
-.mb5 {
-	margin-bottom: 5px;
-}
-.mb8 {
-	margin-bottom: 8px;
-}
-.ml5 {
-	margin-left: 5px;
-}
-.mt10 {
-	margin-top: 10px;
-}
-.mr10 {
-	margin-right: 10px;
-}
-.mb10 {
-	margin-bottom: 10px;
-}
-.ml10 {
-	margin-left: 10px;
-}
-.mt20 {
-	margin-top: 20px;
-}
-.mr20 {
-	margin-right: 20px;
-}
-.mb20 {
-	margin-bottom: 20px;
-}
-.ml20 {
-	margin-left: 20px;
-}
-
-.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
-	font-family: inherit;
-	font-weight: 500;
-	line-height: 1.1;
-	color: inherit;
-}
-
-.el-message-box__status + .el-message-box__message{
-    word-break: break-word;
-}
-
-.el-dialog:not(.is-fullscreen) {
-	margin-top: 6vh !important;
-}
-
-.el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body {
-    overflow: auto;
-	overflow-x: hidden;
-	max-height: 70vh;
-	padding: 10px 20px 0;
-}
-
-.el-table {
-	.el-table__header-wrapper, .el-table__fixed-header-wrapper {
-		th {
-			word-break: break-word;
-			background-color: #f8f8f9;
-			color: #515a6e;
-			height: 40px;
-			font-size: 13px;
-		}
-	}
-	.el-table__body-wrapper {
-		.el-button [class*="el-icon-"] + span {
-			margin-left: 1px;
-		}
-	}
-}
-
-/** 表单布局 **/
-.form-header {
-    font-size:15px;
-	color:#6379bb;
-	border-bottom:1px solid #ddd;
-	margin:8px 10px 25px 10px;
-	padding-bottom:5px
-}
-
-/** 表格布局 **/
-.pagination-container {
-	position: relative;
-	height: 25px;
-	margin-bottom: 10px;
-	margin-top: 15px;
-	padding: 10px 20px !important;
-}
-
-/* tree border */
-.tree-border {
-    margin-top: 5px;
-    border: 1px solid #e5e6e7;
-    background: #FFFFFF none;
-    border-radius:4px;
-}
-
-.pagination-container .el-pagination {
-	right: 0;
-	position: absolute;
-}
-
-@media ( max-width : 768px) {
-  .pagination-container .el-pagination > .el-pagination__jump {
-    display: none !important;
-  }
-  .pagination-container .el-pagination > .el-pagination__sizes {
-    display: none !important;
-  }
-}
-
-.el-table .fixed-width .el-button--mini {
-	padding-left: 0;
-	padding-right: 0;
-	width: inherit;
-}
-
-/** 表格更多操作下拉样式 */
-.el-table .el-dropdown-link,.el-table .el-dropdown-selfdefine {
-	cursor: pointer;
-	margin-left: 5px;
-}
-
-.el-table .el-dropdown, .el-icon-arrow-down {
-	font-size: 12px;
-}
-
-.el-tree-node__content > .el-checkbox {
-	margin-right: 8px;
-}
-
-.list-group-striped > .list-group-item {
-	border-left: 0;
-	border-right: 0;
-	border-radius: 0;
-	padding-left: 0;
-	padding-right: 0;
-}
-
-.list-group {
-	padding-left: 0px;
-	list-style: none;
-}
-
-.list-group-item {
-	border-bottom: 1px solid #e7eaec;
-	border-top: 1px solid #e7eaec;
-	margin-bottom: -1px;
-	padding: 11px 0px;
-	font-size: 13px;
-}
-
-.pull-right {
-	float: right !important;
-}
-
-.el-card__header {
-	padding: 14px 15px 7px;
-	min-height: 40px;
-}
-
-.el-card__body {
-	padding: 15px 20px 20px 20px;
-}
-
-.card-box {
-	padding-right: 15px;
-	padding-left: 15px;
-	margin-bottom: 10px;
-}
-
-/* button color */
-.el-button--cyan.is-active,
-.el-button--cyan:active {
-  background: #20B2AA;
-  border-color: #20B2AA;
-  color: #FFFFFF;
-}
-
-.el-button--cyan:focus,
-.el-button--cyan:hover {
-  background: #48D1CC;
-  border-color: #48D1CC;
-  color: #FFFFFF;
-}
-
-.el-button--cyan {
-  background-color: #20B2AA;
-  border-color: #20B2AA;
-  color: #FFFFFF;
-}
-
-/* text color */
-.text-navy {
-	color: #1ab394;
-}
-
-.text-primary {
-	color: inherit;
-}
-
-.text-success {
-	color: #1c84c6;
-}
-
-.text-info {
-	color: #23c6c8;
-}
-
-.text-warning {
-	color: #f8ac59;
-}
-
-.text-danger {
-	color: #ed5565;
-}
-
-.text-muted {
-	color: #888888;
-}
-
-/* image */
-.img-circle {
-	border-radius: 50%;
-}
-
-.img-lg {
-	width: 120px;
-	height: 120px;
-}
-
-.avatar-upload-preview {
-	position: relative;
-	top: 50%;
-	left: 50%;
-	transform: translate(-50%, -50%);
-	width: 200px;
-	height: 200px;
-	border-radius: 50%;
-	box-shadow: 0 0 4px #ccc;
-	overflow: hidden;
-}
-
-/* 拖拽列样式 */
-.sortable-ghost{
-	opacity: .8;
-	color: #fff!important;
-	background: #42b983!important;
-}
-
-.top-right-btn {
-	position: relative;
-	float: right;
-}

ruoyi-ui/src/assets/styles/zkqy.css

@@ -0,0 +1,301 @@
+@charset "UTF-8";
+/**
+ * 通用css样式布局处理
+ * Copyright (c) 2019 zkqy
+ */
+/** 基础通用 **/
+.pt5 {
+  padding-top: 5px;
+}
+
+.pr5 {
+  padding-right: 5px;
+}
+
+.pb5 {
+  padding-bottom: 5px;
+}
+
+.mt5 {
+  margin-top: 5px;
+}
+
+.mr5 {
+  margin-right: 5px;
+}
+
+.mb5 {
+  margin-bottom: 5px;
+}
+
+.mb8 {
+  margin-bottom: 8px;
+}
+
+.ml5 {
+  margin-left: 5px;
+}
+
+.mt10 {
+  margin-top: 10px;
+}
+
+.mr10 {
+  margin-right: 10px;
+}
+
+.mb10 {
+  margin-bottom: 10px;
+}
+
+.ml10 {
+  margin-left: 10px;
+}
+
+.mt20 {
+  margin-top: 20px;
+}
+
+.mr20 {
+  margin-right: 20px;
+}
+
+.mb20 {
+  margin-bottom: 20px;
+}
+
+.ml20 {
+  margin-left: 20px;
+}
+
+.h1,
+.h2,
+.h3,
+.h4,
+.h5,
+.h6,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  font-family: inherit;
+  font-weight: 500;
+  line-height: 1.1;
+  color: inherit;
+}
+
+.el-message-box__status + .el-message-box__message {
+  word-break: break-word;
+}
+
+.el-dialog:not(.is-fullscreen) {
+  margin-top: 6vh !important;
+}
+
+.el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body {
+  overflow: auto;
+  overflow-x: hidden;
+  max-height: 70vh;
+  padding: 10px 20px 0;
+}
+
+.el-table .el-table__header-wrapper th,
+.el-table .el-table__fixed-header-wrapper th {
+  word-break: break-word;
+  background-color: #f8f8f9;
+  color: #515a6e;
+  height: 40px;
+  font-size: 13px;
+}
+
+.el-table .el-table__body-wrapper .el-button [class*="el-icon-"] + span {
+  margin-left: 1px;
+}
+
+/** 表单布局 **/
+.form-header {
+  font-size: 15px;
+  color: #6379bb;
+  border-bottom: 1px solid #ddd;
+  margin: 8px 10px 25px 10px;
+  padding-bottom: 5px;
+}
+
+/** 表格布局 **/
+.pagination-container {
+  position: relative;
+  height: 25px;
+  margin-bottom: 10px;
+  margin-top: 15px;
+  padding: 10px 20px !important;
+}
+
+/* tree border */
+.tree-border {
+  margin-top: 5px;
+  border: 1px solid #e5e6e7;
+  background: #ffffff none;
+  border-radius: 4px;
+}
+
+.pagination-container .el-pagination {
+  right: 0;
+  position: absolute;
+}
+
+@media (max-width: 768px) {
+  .pagination-container .el-pagination > .el-pagination__jump {
+    display: none !important;
+  }
+  .pagination-container .el-pagination > .el-pagination__sizes {
+    display: none !important;
+  }
+}
+
+.el-table .fixed-width .el-button--mini {
+  padding-left: 0;
+  padding-right: 0;
+  width: inherit;
+}
+
+/** 表格更多操作下拉样式 */
+.el-table .el-dropdown-link,
+.el-table .el-dropdown-selfdefine {
+  cursor: pointer;
+  margin-left: 5px;
+}
+
+.el-table .el-dropdown,
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+
+.el-tree-node__content > .el-checkbox {
+  margin-right: 8px;
+}
+
+.list-group-striped > .list-group-item {
+  border-left: 0;
+  border-right: 0;
+  border-radius: 0;
+  padding-left: 0;
+  padding-right: 0;
+}
+
+.list-group {
+  padding-left: 0px;
+  list-style: none;
+}
+
+.list-group-item {
+  border-bottom: 1px solid #e7eaec;
+  border-top: 1px solid #e7eaec;
+  margin-bottom: -1px;
+  padding: 11px 0px;
+  font-size: 13px;
+}
+
+.pull-right {
+  float: right !important;
+}
+
+.el-card__header {
+  padding: 14px 15px 7px;
+  min-height: 40px;
+}
+
+.el-card__body {
+  padding: 15px 20px 20px 20px;
+}
+
+.card-box {
+  padding-right: 15px;
+  padding-left: 15px;
+  margin-bottom: 10px;
+}
+
+/* button color */
+.el-button--cyan.is-active,
+.el-button--cyan:active {
+  background: #20b2aa;
+  border-color: #20b2aa;
+  color: #ffffff;
+}
+
+.el-button--cyan:focus,
+.el-button--cyan:hover {
+  background: #48d1cc;
+  border-color: #48d1cc;
+  color: #ffffff;
+}
+
+.el-button--cyan {
+  background-color: #20b2aa;
+  border-color: #20b2aa;
+  color: #ffffff;
+}
+
+/* text color */
+.text-navy {
+  color: #1ab394;
+}
+
+.text-primary {
+  color: inherit;
+}
+
+.text-success {
+  color: #1c84c6;
+}
+
+.text-info {
+  color: #23c6c8;
+}
+
+.text-warning {
+  color: #f8ac59;
+}
+
+.text-danger {
+  color: #ed5565;
+}
+
+.text-muted {
+  color: #888888;
+}
+
+/* image */
+.img-circle {
+  border-radius: 50%;
+}
+
+.img-lg {
+  width: 120px;
+  height: 120px;
+}
+
+.avatar-upload-preview {
+  position: relative;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 200px;
+  height: 200px;
+  border-radius: 50%;
+  box-shadow: 0 0 4px #ccc;
+  overflow: hidden;
+}
+
+/* 拖拽列样式 */
+.sortable-ghost {
+  opacity: 0.8;
+  color: #fff !important;
+  background: #42b983 !important;
+}
+
+.top-right-btn {
+  position: relative;
+  float: right;
+}

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

@@ -0,0 +1,291 @@
+/**
+ * 通用css样式布局处理
+ * Copyright (c) 2019 zkqy
+ */
+
+/** 基础通用 **/
+.pt5 {
+  padding-top: 5px;
+}
+.pr5 {
+  padding-right: 5px;
+}
+.pb5 {
+  padding-bottom: 5px;
+}
+.mt5 {
+  margin-top: 5px;
+}
+.mr5 {
+  margin-right: 5px;
+}
+.mb5 {
+  margin-bottom: 5px;
+}
+.mb8 {
+  margin-bottom: 8px;
+}
+.ml5 {
+  margin-left: 5px;
+}
+.mt10 {
+  margin-top: 10px;
+}
+.mr10 {
+  margin-right: 10px;
+}
+.mb10 {
+  margin-bottom: 10px;
+}
+.ml10 {
+  margin-left: 10px;
+}
+.mt20 {
+  margin-top: 20px;
+}
+.mr20 {
+  margin-right: 20px;
+}
+.mb20 {
+  margin-bottom: 20px;
+}
+.ml20 {
+  margin-left: 20px;
+}
+
+.h1,
+.h2,
+.h3,
+.h4,
+.h5,
+.h6,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  font-family: inherit;
+  font-weight: 500;
+  line-height: 1.1;
+  color: inherit;
+}
+
+.el-message-box__status + .el-message-box__message {
+  word-break: break-word;
+}
+
+.el-dialog:not(.is-fullscreen) {
+  margin-top: 6vh !important;
+}
+
+.el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body {
+  overflow: auto;
+  overflow-x: hidden;
+  max-height: 70vh;
+  padding: 10px 20px 0;
+}
+
+.el-table {
+  .el-table__header-wrapper,
+  .el-table__fixed-header-wrapper {
+    th {
+      word-break: break-word;
+      background-color: #f8f8f9;
+      color: #515a6e;
+      height: 40px;
+      font-size: 13px;
+    }
+  }
+  .el-table__body-wrapper {
+    .el-button [class*="el-icon-"] + span {
+      margin-left: 1px;
+    }
+  }
+}
+
+/** 表单布局 **/
+.form-header {
+  font-size: 15px;
+  color: #6379bb;
+  border-bottom: 1px solid #ddd;
+  margin: 8px 10px 25px 10px;
+  padding-bottom: 5px;
+}
+
+/** 表格布局 **/
+.pagination-container {
+  position: relative;
+  height: 25px;
+  margin-bottom: 10px;
+  margin-top: 15px;
+  padding: 10px 20px !important;
+}
+
+/* tree border */
+.tree-border {
+  margin-top: 5px;
+  border: 1px solid #e5e6e7;
+  background: #ffffff none;
+  border-radius: 4px;
+}
+
+.pagination-container .el-pagination {
+  right: 0;
+  position: absolute;
+}
+
+@media (max-width: 768px) {
+  .pagination-container .el-pagination > .el-pagination__jump {
+    display: none !important;
+  }
+  .pagination-container .el-pagination > .el-pagination__sizes {
+    display: none !important;
+  }
+}
+
+.el-table .fixed-width .el-button--mini {
+  padding-left: 0;
+  padding-right: 0;
+  width: inherit;
+}
+
+/** 表格更多操作下拉样式 */
+.el-table .el-dropdown-link,
+.el-table .el-dropdown-selfdefine {
+  cursor: pointer;
+  margin-left: 5px;
+}
+
+.el-table .el-dropdown,
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+
+.el-tree-node__content > .el-checkbox {
+  margin-right: 8px;
+}
+
+.list-group-striped > .list-group-item {
+  border-left: 0;
+  border-right: 0;
+  border-radius: 0;
+  padding-left: 0;
+  padding-right: 0;
+}
+
+.list-group {
+  padding-left: 0px;
+  list-style: none;
+}
+
+.list-group-item {
+  border-bottom: 1px solid #e7eaec;
+  border-top: 1px solid #e7eaec;
+  margin-bottom: -1px;
+  padding: 11px 0px;
+  font-size: 13px;
+}
+
+.pull-right {
+  float: right !important;
+}
+
+.el-card__header {
+  padding: 14px 15px 7px;
+  min-height: 40px;
+}
+
+.el-card__body {
+  padding: 15px 20px 20px 20px;
+}
+
+.card-box {
+  padding-right: 15px;
+  padding-left: 15px;
+  margin-bottom: 10px;
+}
+
+/* button color */
+.el-button--cyan.is-active,
+.el-button--cyan:active {
+  background: #20b2aa;
+  border-color: #20b2aa;
+  color: #ffffff;
+}
+
+.el-button--cyan:focus,
+.el-button--cyan:hover {
+  background: #48d1cc;
+  border-color: #48d1cc;
+  color: #ffffff;
+}
+
+.el-button--cyan {
+  background-color: #20b2aa;
+  border-color: #20b2aa;
+  color: #ffffff;
+}
+
+/* text color */
+.text-navy {
+  color: #1ab394;
+}
+
+.text-primary {
+  color: inherit;
+}
+
+.text-success {
+  color: #1c84c6;
+}
+
+.text-info {
+  color: #23c6c8;
+}
+
+.text-warning {
+  color: #f8ac59;
+}
+
+.text-danger {
+  color: #ed5565;
+}
+
+.text-muted {
+  color: #888888;
+}
+
+/* image */
+.img-circle {
+  border-radius: 50%;
+}
+
+.img-lg {
+  width: 120px;
+  height: 120px;
+}
+
+.avatar-upload-preview {
+  position: relative;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 200px;
+  height: 200px;
+  border-radius: 50%;
+  box-shadow: 0 0 4px #ccc;
+  overflow: hidden;
+}
+
+/* 拖拽列样式 */
+.sortable-ghost {
+  opacity: 0.8;
+  color: #fff !important;
+  background: #42b983 !important;
+}
+
+.top-right-btn {
+  position: relative;
+  float: right;
+}

ruoyi-ui/src/components/RuoYi/Doc/index.vue → ruoyi-ui/src/components/zkqy/Doc/index.vue

@@ -6,16 +6,16 @@
 
 <script>
 export default {
-  name: 'RuoYiDoc',
+  name: "zkqyDoc",
   data() {
     return {
-      url: 'http://doc.ruoyi.vip/ruoyi-vue'
-    }
+      url: "http://doc.zkqy.vip/zkqy-vue",
+    };
   },
   methods: {
     goto() {
-      window.open(this.url)
-    }
-  }
-}
-</script>
+      window.open(this.url);
+    },
+  },
+};
+</script>

ruoyi-ui/src/components/RuoYi/Git/index.vue → ruoyi-ui/src/components/zkqy/Git/index.vue

@@ -6,16 +6,16 @@
 
 <script>
 export default {
-  name: 'RuoYiGit',
+  name: "zkqyGit",
   data() {
     return {
-      url: 'https://gitee.com/y_project/RuoYi-Vue'
-    }
+      url: "https://gitee.com/y_project/zkqy-Vue",
+    };
   },
   methods: {
     goto() {
-      window.open(this.url)
-    }
-  }
-}
-</script>
+      window.open(this.url);
+    },
+  },
+};
+</script>

ruoyi-ui/src/directive/dialog/drag.js

@@ -1,6 +1,6 @@
 /**
 * v-dialogDrag 弹窗拖拽
-* Copyright (c) 2019 ruoyi
+* Copyright (c) 2019 zkqy
 */
 
 export default {

ruoyi-ui/src/directive/dialog/dragHeight.js

@@ -1,6 +1,6 @@
 /**
 * v-dialogDragWidth 可拖动弹窗高度（右下角）
-* Copyright (c) 2019 ruoyi
+* Copyright (c) 2019 zkqy
 */
 
 export default {
@@ -9,14 +9,14 @@ export default {
         const lineEl = document.createElement('div');
         lineEl.style = 'width: 6px; background: inherit; height: 10px; position: absolute; right: 0; bottom: 0; margin: auto; z-index: 1; cursor: nwse-resize;';
         lineEl.addEventListener('mousedown',
-            function(e) {
+            function (e) {
                 // 鼠标按下，计算当前元素距离可视区的距离
                 const disX = e.clientX - el.offsetLeft;
                 const disY = e.clientY - el.offsetTop;
                 // 当前宽度 高度
                 const curWidth = dragDom.offsetWidth;
                 const curHeight = dragDom.offsetHeight;
-                document.onmousemove = function(e) {
+                document.onmousemove = function (e) {
                     e.preventDefault(); // 移动时禁用默认事件
                     // 通过事件委托，计算移动的距离
                     const xl = e.clientX - disX;
@@ -24,7 +24,7 @@ export default {
                     dragDom.style.width = `${curWidth + xl}px`;
                     dragDom.style.height = `${curHeight + yl}px`;
                 };
-                document.onmouseup = function(e) {
+                document.onmouseup = function (e) {
                     document.onmousemove = null;
                     document.onmouseup = null;
                 };

ruoyi-ui/src/directive/dialog/dragWidth.js

@@ -1,6 +1,6 @@
 /**
 * v-dialogDragWidth 可拖动弹窗宽度（右侧边）
-* Copyright (c) 2019 ruoyi
+* Copyright (c) 2019 zkqy
 */
 
 export default {

ruoyi-ui/src/directive/module/clipboard.js

@@ -1,6 +1,6 @@
 /**
 * v-clipboard 文字复制剪贴
-* Copyright (c) 2021 ruoyi
+* Copyright (c) 2021 zkqy
 */
 
 import Clipboard from 'clipboard'

ruoyi-ui/src/directive/permission/hasPermi.js

@@ -1,8 +1,8 @@
- /**
- * v-hasPermi 操作权限处理
- * Copyright (c) 2019 ruoyi
- */
- 
+/**
+* v-hasPermi 操作权限处理
+* Copyright (c) 2019 zkqy
+*/
+
 import store from '@/store'
 
 export default {

ruoyi-ui/src/directive/permission/hasRole.js

@@ -1,8 +1,8 @@
- /**
- * v-hasRole 角色权限处理
- * Copyright (c) 2019 ruoyi
- */
- 
+/**
+* v-hasRole 角色权限处理
+* Copyright (c) 2019 zkqy
+*/
+
 import store from '@/store'
 
 export default {

ruoyi-ui/src/layout/components/Navbar.vue

@@ -12,11 +12,11 @@
         <search id="header-search" class="right-menu-item" />
 
         <!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">
-          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
+          <ruo-yi-git id="zkqy-git" class="right-menu-item hover-effect" />
         </el-tooltip>
 
         <el-tooltip content="文档地址" effect="dark" placement="bottom">
-          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
+          <ruo-yi-doc id="zkqy-doc" class="right-menu-item hover-effect" />
         </el-tooltip> -->
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
@@ -56,8 +56,8 @@ import Hamburger from '@/components/Hamburger'
 import Screenfull from '@/components/Screenfull'
 import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
-import RuoYiGit from '@/components/RuoYi/Git'
-import RuoYiDoc from '@/components/RuoYi/Doc'
+import zkqyGit from '@/components/zkqy/Git'
+import zkqyDoc from '@/components/zkqy/Doc'
 
 export default {
   components: {
@@ -67,8 +67,8 @@ export default {
     Screenfull,
     SizeSelect,
     Search,
-    RuoYiGit,
-    RuoYiDoc
+    zkqyGit,
+    zkqyDoc
   },
   computed: {
     ...mapGetters([

ruoyi-ui/src/main.js

@@ -34,7 +34,7 @@ import "@packages/theme/index.scss";
 
 
 import '@/assets/styles/index.scss' // global css
-import '@/assets/styles/ruoyi.scss' // ruoyi css
+import '@/assets/styles/zkqy.scss' // zkqy css
 import App from './App'
 import store from './store'
 
@@ -47,7 +47,7 @@ import './assets/icons' // icon
 import './permission' // permission control
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
-import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
+import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/zkqy";
 // 分页组件
 import Pagination from "@/components/Pagination";
 // 自定义表格工具组件

ruoyi-ui/src/plugins/download.js

@@ -3,7 +3,7 @@ import { Message } from 'element-ui'
 import { saveAs } from 'file-saver'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
-import { blobValidate } from "@/utils/ruoyi";
+import { blobValidate } from "@/utils/zkqy";
 
 const baseURL = process.env.VUE_APP_BASE_API
 

ruoyi-ui/src/utils/dict/Dict.js

@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import { mergeRecursive } from "@/utils/ruoyi";
+import { mergeRecursive } from "@/utils/zkqy";
 import DictMeta from './DictMeta'
 import DictData from './DictData'
 

ruoyi-ui/src/utils/dict/DictMeta.js

@@ -1,4 +1,4 @@
-import { mergeRecursive } from "@/utils/ruoyi";
+import { mergeRecursive } from "@/utils/zkqy";
 import DictOptions from './DictOptions'
 
 /**
@@ -25,7 +25,7 @@ export default class DictMeta {
  * @param {Object} options
  * @returns {DictMeta}
  */
-DictMeta.parse= function(options) {
+DictMeta.parse = function (options) {
   let opts = null
   if (typeof options === 'string') {
     opts = DictOptions.metas[options] || {}

ruoyi-ui/src/utils/dict/DictOptions.js

@@ -1,4 +1,4 @@
-import { mergeRecursive } from "@/utils/ruoyi";
+import { mergeRecursive } from "@/utils/zkqy";
 import dictConverter from './DictConverter'
 
 export const options = {

ruoyi-ui/src/utils/index.js

@@ -1,4 +1,4 @@
-import { parseTime } from './ruoyi'
+import { parseTime } from './zkqy'
 
 
 // export const $ = name => document.querySelector(name)

ruoyi-ui/src/utils/request.js

@@ -3,7 +3,7 @@ import { Notification, MessageBox, Message, Loading } from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
-import { tansParams, blobValidate } from "@/utils/ruoyi";
+import { tansParams, blobValidate } from "@/utils/zkqy";
 import cache from '@/plugins/cache'
 import { saveAs } from 'file-saver'
 

ruoyi-ui/src/utils/ruoyi.js → ruoyi-ui/src/utils/zkqy.js

@@ -2,7 +2,7 @@
 
 /**
  * 通用js方法封装处理
- * Copyright (c) 2019 ruoyi
+ * Copyright (c) 2019 zkqy
  */
 
 // 日期格式化

ruoyi-ui/src/views/bpmprocess/scriptManage.vue

@@ -279,7 +279,11 @@
 
 <script>
 import { listScript, getScript, addScript } from "@/api/bpmprocess/process";
-import { updateScript, delScript } from "@/api/bpmprocess/script";
+import {
+  updateScript,
+  delScript,
+  queryTemplateBaseTable,
+} from "@/api/bpmprocess/script";
 import uuid from "@/utils/bpmn/uuid";
 import Editor from "vue2-ace-editor";
 import { v4 as uuidv4 } from "uuid";
@@ -470,9 +474,30 @@ export default {
       });
       const id = row.id || this.ids;
       getScript(id).then((response) => {
-        response.data.scriptType = response.data.scriptType.toString();
-        response.data.tableName = null?.split(",");
-        this.form = response.data;
+        let {
+          id,
+          scriptKey,
+          scriptFunctionName,
+          scriptName,
+          scriptFunctionCode,
+          scriptType,
+          industryType,
+          scriptDescription,
+          tableName,
+        } = response.data;
+        Object.assign(this.form, {
+          id,
+          scriptKey,
+          scriptFunctionName,
+          scriptName,
+          scriptFunctionCode,
+          scriptType,
+          industryType,
+          scriptDescription,
+          tableName,
+        });
+        this.form.scriptType = response.data.scriptType.toString();
+        this.form.tableName = this.form.tableName?.split(",");
         this.open = true;
         this.title = "修改流程节点脚本";
       });

ruoyi-ui/src/views/login.vue

@@ -153,7 +153,7 @@
     </el-form>
   
     <div class="el-login-footer">
-      <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright © 2018-2023 zkqy.vip All Rights Reserved.</span>
     </div> -->
   </div>
 </template>
@@ -183,7 +183,7 @@ export default {
         password: [
           { required: true, trigger: "blur", message: "请输入您的密码" },
         ],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }],
+        code: [{ required: true, trigger: "blur", message: "请输入验证码" }],
       },
       loading: true,
       // 验证码开关

ruoyi-ui/src/views/monitor/job/index.vue

@@ -301,7 +301,7 @@
                 <el-tooltip placement="top">
                   <div slot="content">
                     Bean调用示例：ryTask.ryParams('ry')
-                    <br />Class类调用示例：com.ruoyi.quartz.task.RyTask.ryParams('ry')
+                    <br />Class类调用示例：com.zkqy.quartz.task.RyTask.ryParams('ry')
                     <br />参数说明：支持字符串，布尔类型，长整型，浮点型，整型
                   </div>
                   <i class="el-icon-question"></i>

ruoyi-ui/src/views/register.vue

@@ -82,7 +82,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-register-footer">
-      <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright © 2018-2023 zkqy.vip All Rights Reserved.</span>
     </div>
   </div>
 </template>

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

@@ -366,7 +366,7 @@ import {
   activationOperation,
 } from "@/api/system/tenant";
 import { getDataSourceInfo, insertDataSource } from "@/api/system/data";
-import { servicesLoading } from "@/utils/ruoyi";
+import { servicesLoading } from "@/utils/zkqy";
 
 export default {
   name: "Tenant",

ruoyi-ui/src/views/tool/gen/genInfoForm.vue

@@ -15,7 +15,7 @@
         <el-form-item prop="packageName">
           <span slot="label">
             生成包路径
-            <el-tooltip content="生成在哪个java包下，例如 com.ruoyi.system" placement="top">
+            <el-tooltip content="生成在哪个java包下，例如 com.zkqy.system" placement="top">
               <i class="el-icon-question"></i>
             </el-tooltip>
           </span>

ruoyi-ui/src/views/tool/gen/index.vue

@@ -41,13 +41,11 @@
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
-        >搜索
-        </el-button
-        >
+          >搜索
+        </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-        >重置
-        </el-button
-        >
+          >重置
+        </el-button>
       </el-form-item>
     </el-form>
 
@@ -60,9 +58,8 @@
           size="mini"
           @click="handleGenTable"
           v-hasPermi="['tool:gen:code']"
-        >生成
-        </el-button
-        >
+          >生成
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -72,9 +69,8 @@
           size="mini"
           @click="openImportTable"
           v-hasPermi="['tool:gen:import']"
-        >导入
-        </el-button
-        >
+          >导入
+        </el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -96,9 +92,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['tool:gen:remove']"
-        >删除
-        </el-button
-        >
+          >删除
+        </el-button>
       </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
@@ -119,8 +114,8 @@
       <el-table-column label="序号" type="index" width="50" align="center">
         <template slot-scope="scope">
           <span>{{
-              (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
-            }}</span>
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -167,66 +162,55 @@
               处理<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item
-              >
+              <el-dropdown-item>
                 <el-button
                   type="text"
                   size="small"
                   icon="el-icon-view"
                   @click="handlePreview(scope.row)"
                   v-hasPermi="['tool:gen:preview']"
-                >预览
-                </el-button
-                >
-              </el-dropdown-item
-              >
-              <el-dropdown-item
-              >
+                  >预览
+                </el-button>
+              </el-dropdown-item>
+              <el-dropdown-item>
                 <el-button
                   type="text"
                   size="small"
                   icon="el-icon-edit"
                   @click="handleEditTable(scope.row)"
                   v-hasPermi="['tool:gen:edit']"
-                >编辑
-                </el-button
-                >
+                  >编辑
+                </el-button>
               </el-dropdown-item>
-              <el-dropdown-item
-              >
+              <el-dropdown-item>
                 <el-button
                   type="text"
                   size="small"
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)"
                   v-hasPermi="['tool:gen:remove']"
-                >删除
-                </el-button
-                >
+                  >删除
+                </el-button>
               </el-dropdown-item>
-              <el-dropdown-item
-              >
+              <el-dropdown-item>
                 <el-button
                   type="text"
                   size="small"
                   icon="el-icon-refresh"
                   @click="handleSynchDb(scope.row)"
                   v-hasPermi="['tool:gen:edit']"
-                >同步
-                </el-button
-                >
+                  >同步
+                </el-button>
               </el-dropdown-item>
-              <el-dropdown-item
-              >
+              <el-dropdown-item>
                 <el-button
                   type="text"
                   size="small"
                   icon="el-icon-download"
                   @click="handleGenTable(scope.row)"
                   v-hasPermi="['tool:gen:code']"
-                >生成代码
-                </el-button
-                >
+                  >生成代码
+                </el-button>
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -298,14 +282,13 @@
             v-clipboard:copy="value"
             v-clipboard:success="clipboardSuccess"
             style="float: right"
-          >复制
-          </el-link
-          >
+            >复制
+          </el-link>
           <pre><code class="hljs" v-html="highlightedCode(value, key)"></code></pre>
         </el-tab-pane>
       </el-tabs>
     </el-dialog>
-    <import-table ref="import" @ok="handleQuery"/>
+    <import-table ref="import" @ok="handleQuery" />
   </div>
 </template>
 
@@ -333,7 +316,7 @@ hljs.registerLanguage("sql", require("highlight.js/lib/languages/sql"));
 
 export default {
   name: "Gen",
-  components: {importTable},
+  components: { importTable },
   data() {
     return {
       // 遮罩层
@@ -414,7 +397,7 @@ export default {
       } else {
         this.$download.zip(
           "/tool/gen/batchGenCode?tables=" + tableNames,
-          "ruoyi.zip"
+          "zkqy.zip"
         );
       }
     },
@@ -429,8 +412,7 @@ export default {
         .then(() => {
           this.$modal.msgSuccess("同步成功");
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
     /** 打开导入表弹窗 */
     openImportTable() {
@@ -475,7 +457,7 @@ export default {
     handleEditTable(row) {
       const tableId = row.tableId || this.ids[0];
       const tableName = row.tableName || this.tableNames[0];
-      const params = {pageNum: this.queryParams.pageNum};
+      const params = { pageNum: this.queryParams.pageNum };
       this.$tab.openPage(
         "修改[" + tableName + "]生成配置",
         "/tool/gen-edit/index/" + tableId,
@@ -494,8 +476,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
   },
 };

ruoyi-ui/vue.config.js

@@ -37,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.59:8080`,
+        target: `http://192.168.110.83:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''