centaline-data-driven 1.3.36 → 1.3.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.3.36",
+  "version": "1.3.37",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/Form.vue

@@ -10,7 +10,7 @@
 
 <script>
   export default {
-    name: 'App',
+    name: 'DataDrivenForm',
     data() {
       return {
         apiParam:{

package/src/centaline/common/index.js

@@ -341,9 +341,6 @@ const common = {
       else if (parent.$options.name === 'DataDrivendetail') {
         return parent;
       } 
-      else if (parent.$options.name === 'App') {
-        return parent;
-      } 
       else {
         return this.getParentPane(parent);
       }

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue

@@ -10,7 +10,7 @@
             <span>{{ model.fields1Dic.EstateName.value }}</span>
             <span> {{ model.fields1Dic.BuildingName.value }}</span>
             <span>{{ model.fields1Dic.RoomNo.value }}</span>
-            <img :src="model.fields1Dic.FavoriteUrl.value" alt="" class="collection"/>
+            <img :src="model.actionRouterFavorite.imgUrl" alt="" @click="fieldClickHandler(model.actionRouterFavorite, $event)" class="collection" />
           </div>
           <div class="title-other">
             <span>{{ model.fields1Dic.PropertyNo.label }}{{ model.fields1Dic.PropertyNo.value }}</span>
@@ -646,6 +646,9 @@ export default {
     loadBaseInfo() {
       this.model.loadBaseInfo();
     },
+    loadFavorite() {
+      this.model.loadFavorite();
+    },
     handleClick(tab, event) {
       let i = tab.index;
       if (this.model.tags2 && this.model.tags2[i]) {
@@ -697,7 +700,11 @@ export default {
         });
         callBack = "loadOperation";
       }
-
+      if (router == undefined && this.model.actionRouterFavorite) {
+        if (field.id === this.model.actionRouterFavorite.id) {
+          router = this.model.actionRouterFavorite;
+        }
+      }
       if (router) {
         if (field.isSubmitDataFromSelf) {
           router.submitFormField.forEach((v) => {
@@ -712,6 +719,9 @@ export default {
         if(router.id=="PropertyEdit"){
           callBack="loadBaseInfo"
         }
+        else if (router.id == "Favorite") {
+          callBack = "loadFavorite"
+        }
       }
 
       if (callBack) {
@@ -721,6 +731,9 @@ export default {
         else if(callBack=='loadBaseInfo'){
           this.routerClickHandler(router, submitData, self.loadBaseInfo);
         }
+        else if (callBack == 'loadFavorite') {
+          this.routerClickHandler(router, submitData, self.loadFavorite);
+        }
       } 
       else {
         this.routerClickHandler(router, submitData);
@@ -794,6 +807,11 @@ export default {
                       });
                       self.$common.closeDialog(dialogOption.dialog);
                     },
+                    closeDialog(ev) {
+                      if (field.id == "Favorite" && callBack) {
+                        callBack();
+                      }
+                    }
                   },
                 },
               ],

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -10,7 +10,7 @@
             <span>{{ model.fields1Dic.EstateName.value }}</span>
             <span> {{ model.fields1Dic.BuildingName.value }}</span>
             <span>{{ model.fields1Dic.RoomNo.value }}</span>
-            <img :src="model.fields1Dic.FavoriteUrl.value" alt="" @click="fieldClickHandler(model.actionRouterFavorite, $event)" class="collection" />
+            <img :src="model.actionRouterFavorite.imgUrl" alt="" @click="fieldClickHandler(model.actionRouterFavorite, $event)" class="collection" />
           </div>
           <div class="title-other">
             <span>{{ model.fields1Dic.PropertyNo.label }}{{ model.fields1Dic.PropertyNo.value }}</span>