Merge branch 'LBCS-185' into 'develop'

测试前检测是否保存了，添加路径和名称字符校验

See merge request luban/dataspherestudio!238

Author: 陆小龙

web/src/apps/dataService/module/common/treeMenu.vue

@@ -71,7 +71,7 @@ export default {
       });
     },
     handleTreeModal(project) {
-      this.$emit("showModal", { type: "api", data: { ...project } });
+      this.$emit("showModal", { type: "api", data: { ...project }, groupDatas: [...this.originDatas] });
       this.treeModalShow = true;
       this.currentTreeProject = project;
     },

web/src/apps/dataService/module/dataService/emptyGuide.vue

@@ -22,7 +22,7 @@ export default {
     return {
       steps: [
         "点击左侧菜单-服务开发课表-加号按钮-创建业务流程",
-        "点击业务流程-加号按钮-常见API",
+        "点击业务流程-加号按钮-创建API",
         "配置API-添加数据源及设置参数，并保存",
         "测试",
         "发布-左侧菜单-服务管理，管理已发布API"

web/src/apps/dataService/module/dataService/index.vue

@@ -148,6 +148,7 @@ import navMenu from "../common/navMenu.vue";
 import tag from "@/components/tag/index.vue";
 import apiCongfig from "./apiConfig.vue";
 import api from "@/common/service/api";
+import _ from 'lodash';
 
 export default {
   components: {
@@ -158,23 +159,31 @@ export default {
   data() {
     const validateGroupName = (rule, value, callback) => {
       const result = value && value.trim();
-      if (!result) {
-        callback(new Error("业务名称不能为空"));
+      const reg = /^[\u4e00-\u9fa5a-zA-Z][\w_\u4e00-\u9fa5]{3,19}$/g;
+      if (!reg.test(result)) {
+        callback(
+          new Error(
+            "支持汉字、英文、数字、下划线（_），以英文或汉字开头，4~20个字符"
+          )
+        );
       } else {
         if (this.groupDatas.some(item => item.name.trim() === result)) {
           callback(new Error("该名称已经存在"));
           return;
-        } else if (result.length > 20) {
-          callback(new Error("名称不能超过20个字符"));
         } else {
           callback();
         }
       }
     };
     const validateAPIName = (rule, value, callback) => {
       const result = value && value.trim();
-      if (!result) {
-        callback(new Error("名称不能为空"));
+      const reg = /^[\u4e00-\u9fa5a-zA-Z][\w_\u4e00-\u9fa5]{3,19}$/g;
+      if (!reg.test(result)) {
+        callback(
+          new Error(
+            "支持汉字、英文、数字、下划线（_），以英文或汉字开头，4~20个字符"
+          )
+        );
       } else {
         const apis = (this.groupData && this.groupData.apis) || [];
         const isUpdate = this.modalType === "updateApi";
@@ -199,19 +208,36 @@ export default {
         if (isHad) {
           callback(new Error("该名称已经存在"));
           return;
-        } else if (result.length > 20) {
-          callback(new Error("名称不能超过20个字符"));
         } else {
           callback();
         }
       }
     };
     const validateAPIPath = (rule, value, callback) => {
       const result = value && value.trim();
-      if (!result) {
-        callback(new Error("路径不能为空"));
+      const reg = /^\/[\w_-]{3,199}$/g;
+      if (!reg.test(result)) {
+        callback(
+          new Error(
+            "支持英文、数字、下划线（_）、连字符（-），且只能以正斜线（/）开头，不超过200个字符，如/user"
+          )
+        );
       } else {
-        callback();
+        const isUpdate = this.modalType === "updateApi";
+        const isHad = this.allProjectTree.some(item => {
+          const { apis } = item;
+          return apis.some(api => {
+            return isUpdate
+              ? api.path.trim() === result && api.id !== this.apiForm.id
+              : api.path.trim() === result;
+          });
+        });
+        if (isHad) {
+          callback(new Error("该路径已经存在，请更换"));
+          return;
+        } else {
+          callback();
+        }
       }
     };
     return {
@@ -305,8 +331,10 @@ export default {
       this.modalVisible = true;
       this.modalType = type;
       this.modalTitle = type === "group" ? "新增业务流程" : "生成API";
+      console.log(pyload);
       if (type === "api") {
         this.groupData = data;
+        this.allProjectTree = groupDatas;
       } else {
         this.groupDatas = groupDatas;
       }
@@ -382,7 +410,8 @@ export default {
         isActive: true,
         name: data.apiName,
         id: data.id || data.tempId,
-        data
+        data,
+        originData: _.cloneDeep(data)
       });
       this.apiTabDatas = newApis;
     },
@@ -514,7 +543,7 @@ export default {
       const newApis = this.apiTabDatas.map(item => {
         let tmp = { ...item };
         if (tmp.id === data.id) {
-          tmp = { ...item, name: data.apiName, data };
+          tmp = { ...item, name: data.apiName, data, originData: _.cloneDeep(data) };
         }
         return tmp;
       });

web/src/apps/dataService/module/dataService/paramsConfig.vue

@@ -295,6 +295,7 @@
 <script>
 import api from "@/common/service/api";
 import Test from "../common/test.vue";
+import _ from "lodash";
 
 const compareItems = [
   {
@@ -630,20 +631,24 @@ export default {
       this.getTableCols(tblName, true);
     }
   },
-  mounted() {},
   methods: {
     handleToolShow(item) {
+      const { data, originData } = this.apiData;
       const { type } = item;
       if (type === "property") {
         this.$emit("showApiForm", this.apiData);
       } else if (type === "save") {
-        this.saveApi();
+        this.validateApi(type);
       } else if (type === "test") {
-        if (!this.apiData.data.id) {
+        if (!data.id) {
           this.$Message.info("请先保存API");
           return;
         }
-        this.showTestPanel = true;
+        if (!_.isEqual(data, originData)) {
+          this.$Message.info("api内容有更改，请先保存API");
+          return;
+        }
+        this.validateApi(type);
       } else if (type === "release") {
         if (!this.hadTestSuccess) {
           this.$Message.info("请先测试API");
@@ -658,9 +663,10 @@ export default {
     setTestSuccess() {
       this.hadTestSuccess = true;
     },
-    saveApi() {
+    validateApi(action) {
       const { data } = this.apiData;
       const { apiType } = data;
+      const isSave = action === "save";
       const {
         name,
         type,
@@ -763,15 +769,28 @@ export default {
             this.$refs["pageForm"].validate(valid2 => {
               if (valid2) {
                 reqParams.pageSize = parseInt(this.pageForm.pageSize);
-                this.executeSaveApi(reqParams);
+                isSave
+                  ? this.executeSaveApi(reqParams)
+                  : this.showTest(reqParams);
               }
             });
             return;
           }
-          this.executeSaveApi(reqParams);
+          isSave ? this.executeSaveApi(reqParams) : this.showTest(reqParams);
         }
       });
     },
+    showTest(reqParams) {
+      const { originData } = this.apiData;
+      const isSame = Object.keys(reqParams).every(
+        key => originData[key] + "" === reqParams[key] + ""
+      );
+      if (!isSame) {
+        this.$Message.info("api内容有更改，请先保存API");
+        return;
+      }
+      this.showTestPanel = true;
+    },
     executeSaveApi(reqParams) {
       const { data } = this.apiData;
       this.confirmLoading = true;