Merge branch 'dev'

src/components/app-form-part/app-form-part.vue

@@ -10,6 +10,14 @@ import { Subject, Subscription } from "rxjs";
 })
 export default class AppFormPart extends Vue {
 
+  /**
+   * 系统名称
+   *
+   * @type {string}
+   * @memberof AppFormPart
+   */
+  @Prop() public systemCodeName!: string;
+
   /**
    * 应用名称
    *
@@ -98,7 +106,7 @@ export default class AppFormPart extends Vue {
    * @type {(Subscription | undefined)}
    * @memberof AppFormPart
    */
-  public remoteUrl:string =`/getFormModel/${this.appCodeName}/${this.deCodeName}/${this.formCodeName}/${this.formDetailCodeName}`;
+  public remoteUrl:string =`/${this.systemCodeName.toLowerCase()}-${this.appCodeName.toLowerCase()}/components/${this.formDetailCodeName.toLowerCase()}`;
 
   /**
    * 动态表单配置对象

src/components/avue-custom-form/avue-custom-form.vue

@@ -63,8 +63,7 @@ export default class AvueCustomForm extends Vue {
    * @type {any}
    * @memberof AvueCustomForm
    */
-  @Prop()
-  public formData: any;
+  @Prop() public formData: any;
 
   /**
    * 表单状态
@@ -193,7 +192,7 @@ export default class AvueCustomForm extends Vue {
         const get: Promise<any> = this.$http.get(this.url);
         get.then((response: any) => {
           if (response && response.data) {
-            that.formOption = JSON.parse(response.data);
+            that.formOption = response.data;
             if (this.isFormData) that.getFormData();
           }
         });