d

3223c824 · 蒋勇 · db9c6f74 · 3223c824 · 3223c824 · 3223c824
Commit 3223c824 authored May 06, 2020 by 蒋勇
6 changed files
--- a/iview-admin/src/config/index.js
+++ b/iview-admin/src/config/index.js
@@ -3,7 +3,7 @@ export default {
   * @description 配置显示在浏览器标签的title
   */
  title: '智慧中台 ',
-  appkey:'c52a9325-6444-421b-aa7d-d89a54a9f6b4',
+  appkey:'3dd193ff-9a39-4d96-87ef-f7af75c49fb3',
  /**
   * @description token在Cookie中存储的天数，默认1天
   */

--- a/iview-admin/src/store/module/metainfo/appinfo.js
+++ b/iview-admin/src/store/module/metainfo/appinfo.js
@@ -2,8 +2,8 @@ export default {
  bizCode: "appinfo",
  name: "用户信息维护",
  list: [
-    { title: 'APPKEY', key: 'appkey', sortable: true, insearch: true},//slot--自定义列   insearch--是否快速查询
+    { title: 'APPKEY', key: 'appkey', sortable: true, insearch: false},//slot--自定义列   insearch--是否快速查询
-    { title: '名称x', key: 'name', sortable: true, insearch: true},//slot--自定义列   insearch--是否快速查询
+    { title: '名称', key: 'name', sortable: true, insearch: true},//slot--自定义列   insearch--是否快速查询
    { title: '域名', key: 'domainName', sortable: true, insearch: true},//slot--自定义列   insearch--是否快速查询
    { title: '服务', key: 'backend', sortable: true, insearch: true},//slot--自定义列   insearch--是否快速查询
    { title: '创建时间', key: 'created_at' ,slot:'created_at' },
@@ -15,7 +15,7 @@ export default {
    }
  ],
  "form": {
-    name: "ccccc",
+    name: "应用信息",
    main: [
        {
          "title":"关键信息",
@@ -23,7 +23,6 @@ export default {
             { "type": "input", "label": "应用名称", "prop": "name", "placeHolder": "请输入昵称", "style": "", rules: [{ "required": true, "message": '  ', "trigger": 'blur' },] },
             { "type": "input", "label": "路由域名", "prop": "domainName", "placeHolder": "请输入邮件", "style": "", rules: [{ "required": true, "message": '  ', "trigger": 'blur' },] },
             { "type": "input", "label": "后端服务", "prop": "backend", "placeHolder": "请输入帐户名", "style": "", rules: [{ "required": true, "message": '  ', "trigger": 'blur' },] },
-             { "type": "input", "label": "后端服务", "prop": "backend2", "placeHolder": "请输入帐户名", "style": "", rules: [{ "required": true, "message": '  ', "trigger": 'blur' },] },
           ]
        }
    ],

--- a/iview-admin/src/store/module/metainfo/routeinfo.js
+++ b/iview-admin/src/store/module/metainfo/routeinfo.js
@@ -16,8 +16,11 @@ export default {
    main: [
        {
          "title":"关键信息",
+          cols:1,
           ctls:[
             { "type": "input", "label": "路由名称", "prop": "name", "placeHolder": "请输入路由名称", "style": "", rules: [{ "required": true, "message": '  ', "trigger": 'blur' },] },
+             { "type": "input", "label": "域名列表", "prop": "shosts", "placeHolder": "请输入逗号分隔的域名列表", "style": "", rules: [{ validator: "validatex", trigger: "blur" }] },
+             { "type": "input", "label": "路径列表", "prop": "spaths", "placeHolder": "请输入逗号分隔的路径列表", "style": "", rules: [{ validator: "validatex", trigger: "blur" }] },
           ]
        }
    ],

--- a/iview-admin/src/view/appinfo/appinfo_page.vue
+++ b/iview-admin/src/view/appinfo/appinfo_page.vue
@@ -6,6 +6,7 @@
      metaName="app_info"
      packageName="common"
      isMulti
+      :refvalidatemethod="validatemethod"
    ></BizTable>
  </div>
 </template>
@@ -20,6 +21,27 @@ export default {
    BizTable
  },
  methods: {
+    validatemethod(rule, value, callback) {
+      if (rule.field == "hosts") {
+        let attrhosts = value.split(",");
+        if (attrhosts.length == 0) {
+          callback(new Error("多个域名需要以逗号分隔"));
+        }
+      }
+      if (rule.field == "paths") {
+        let attrpaths = value.split(",");
+        if (attrpaths.length == 0) {
+          callback(new Error("多个路径需要以逗号分隔"));
+        }else{
+          attrpaths.forEach(p=>{
+            if(!p.startsWith("/")){
+               return callback(new Error("路径必须以/开始"))
+            }
+          })
+        }
+      }
+      return callback();
+    },
    // onnew() {
    //   this.$refs.bt.setFormCtlVisable("userName", true);
    // },

--- a/iview-admin/src/view/components/tables/biztables.vue
+++ b/iview-admin/src/view/components/tables/biztables.vue
@@ -120,6 +120,7 @@ export default {
  },
  props: {
    isLazy:Boolean,
+    isChildList:Boolean,
    initWhere: {
      type: Object,
      default(){
@@ -255,7 +256,8 @@ export default {
        let url = this.buildUrl("delete");
        let data = { id: this.currentRow.id };
        deleteData(url, data).then(res => {
-          if (res.data.data.status == 0) {
+          let rtn=res.data
+          if (rtn.status == 0) {
            this.$Message.success("当前记录已经成功删除.");
            this.fetchData();
          } else {
@@ -328,6 +330,10 @@ export default {
              if (this.fm_status == "create") {
                url = this.buildUrl("create");
                msg = "当前的新增操作已成功.";
+                if(this.isChildList){
+                  //如果当前列表是作为表单子列表，那么需要设置当前新增对象的所属表单id
+                  row=Object.assign(row,this.initWhere)
+                }
              }
              console.log("row........................save");
              console.log(row);

--- a/iview-admin/src/view/components/tables/forms/forms.vue
+++ b/iview-admin/src/view/components/tables/forms/forms.vue
@@ -110,7 +110,9 @@
              :packageName="lst['packageName']"
              :initPropZIndex="1100"
              :isLazy="lst.isLazy"
+              :isChildList="true"
              :initWhere="getInitWhere(lst.initWhere)"
+              :refvalidatemethod="refvalidatemethod"
            ></ChildList>
            </TabPane>
          </Tabs>
@@ -263,9 +265,7 @@ export default {
    }
  },
  computed:{
-      initwhere(){
-        return 
-      }
  },
  methods: {
    getInitWhere(initWhereObj){