centaline-data-driven 1.3.50 → 1.3.51

package/package.json

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

package/src/SearchList.vue

@@ -8,15 +8,15 @@
     :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
     :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'" :apiParam="para"></ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" 
-      :searchDataApi="'/api/third-dept-tran/tran-list'">
-    </ct-searchlist> -->
+    <ct-searchlist :searchConditionApi="'/api/agenttrans/transactionList/getLayoutOfSearch'" 
+      :searchDataApi="'/api/agenttrans/transactionList/getTableList'">
+    </ct-searchlist>
 
-    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
+    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
       :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
       :searchStatsApi="'/exampleList/getListStats'">
-    </ct-searchlist>
+    </ct-searchlist> -->
 
     <ct-dialog-list></ct-dialog-list>
   </div>

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

@@ -848,8 +848,29 @@ export default {
           // if (typeof field.onClick !== 'undefined') {
           //   verified = self.$common.excute.call(self.model.scripts, field.onClick);
           // }
-
-          if (field.isOpenForm) {
+          if (field.isBrowseAttachment) {//浏览附件
+            var MediaAlbum = [
+              { albumName: self.model.title || "媒体", medias: [] },
+            ];
+            if (field.action) {
+              var callback = function (data) {
+                MediaAlbum[0].medias = data;
+                self.$common.viewerfile(field, MediaAlbum, 0, 0);
+              }
+              var vsubmitData = {
+                ...field.getActionPara(submitData).para,
+                ...submitData
+              };
+              self.model.getAction(field.action, vsubmitData, callback);
+            }
+            else {
+              submitData.mediaData.forEach((v) => {
+                MediaAlbum[0].medias.push(v);
+              });
+              self.$common.viewerfile(field, MediaAlbum, 0, 0);
+            }
+          }
+          else if (field.isOpenForm) {
             var dialogOption = {
               title: field.pageTitle,
               pane: self.$common.getParentPane(self),

package/src/centaline/dynamicSearchList/src/dynamicSearchList.vue

@@ -12,7 +12,7 @@
       :categoryLoaded="loaded.categoryLoaded" @search="search()" @saveShortcut="saveShortcut" 
       @showTitle="showTitleScreenHandler"></ct-searchscreen>
 
-      <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" :from="from" @loaded="tableLoaded"
+      <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" :from="from" :isIframe="isIframe" @loaded="tableLoaded"
       @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate" 
       @rowClickHandle="rowClickHandle" @scrollHandle="scrollHandle" @refreshRowHandle="refreshRowHandle" @doClosePopoverHandle="doClosePopoverHandle" 
       @showTitle="showTitleHandler"></ct-searchtable>
@@ -63,12 +63,20 @@
         default:'searchlist'
       },
     },
+  data() {
+    return {
+      isIframe: false,
+    };
+  },
     created() {
       this.model = this.vmodel;
       this.screenPara=this.apiParam;
       if(this.searchCategoryApi){
         this.loaded.categoryLoaded=false;
       }
+      if(this.apiParam && this.apiParam.isIframe && this.apiParam.isIframe=='true'){
+        this.isIframe=true;
+      }
     },
     computed: {
     },

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -191,6 +191,10 @@ export default {
       String,
       default: "searchlist",
     },
+    isIframe: {
+      Boolean,
+      default: false,
+    },
   },
   computed: {},
   data() {
@@ -1091,6 +1095,9 @@ export default {
           let title = field.pageTitle == undefined ? field.label : field.pageTitle;
           submitData.actionType = field.actionType;
           var fun = self.$common.getDataDrivenOpts().handler[action];
+          if(self.isIframe){
+            submitData.isIframe=self.isIframe;
+          }
           fun(submitData, title, self.$parent);
         }
       };

package/src/centaline/loader/src/ctl/Base.js

@@ -46,6 +46,15 @@ const Base = function (source) {
     set code1(v) {
       source.code1 = v;
     },
+    set code2(v) {
+      source.code2 = v;
+    },
+    set code3(v) {
+      source.code3 = v;
+    },
+    set code4(v) {
+      source.code4 = v;
+    },
     get value() {
       return source.code1;
     },

package/src/main.js

@@ -13,10 +13,10 @@ Vue.use(ElementUI, { size: 'mini'});
 Vue.config.productionTip = false;
 Vue.use(centaline, {
   // baseUrl: "http://10.88.22.13:7070/v1/form/router",
-  baseUrl: "http://10.88.23.25:9999/v1/form/router",
+  // baseUrl: "http://10.88.23.25:9999/v1/form/router",
   // baseUrl: "http://10.88.22.40:8080/", 
-  // baseUrl: "http://tjcptest.centaline.com.cn/", 
-  // flagRouterSelf: true,
+  baseUrl: "http://tjcptest.centaline.com.cn/", 
+  flagRouterSelf: true,
   zindex: 999,
   showRequestSuccessMessage: true,
   showRequestErrorMessage: true,
@@ -41,7 +41,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '8ce4e917-2183-40d9-8b87-53ae45e1fc59',
+        oldToken: '925105ab-273a-4d9e-bb9c-83dca3282a8a',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEKg0AQRP9laxe8u3X31i6epslHyMkpmCpEhYSQf48h2tnnFa8YBmZeMC0dlCAbeKCdVjfwQDutMaRiuMGTSkBicuhN8BiIA53rxoWqhgz6xw1Kw5w7ESeUwRjnX2A112-wTP390j__ce46j-vsIAN5ch1alrSWhTCqRiRbJEtc-MQM7w8AAAD__w.dYqgv0MHo3uvKDGcRKsCZt4UCdSl1qVTNQt628giu6k',
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',