centaline-data-driven 1.5.9 → 1.5.11

package/package.json

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

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/salemattersmanage/agentcontractparameter/agentcontractparameterform'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,21 +12,6 @@
     data() {
       return {
         apiParam:{
-          actionType
-: 
-"1",
-originalTraId
-: 
-"1654759860127432706",
-pageOnly
-: 
-"true",
-pageStyle
-: 
-"2",
-pageTitle
-: 
-"成交报告"
         },
         topHeight:10,
       }

package/src/SearchList.vue

@@ -15,12 +15,12 @@
     </ct-searchlist> -->
 
 
-    <ct-searchlist :apiParam="para"
+    <!-- <ct-searchlist :apiParam="para"
       :searchConditionApi="'/ProfileWorklistList/getLayoutOfSearch'" 
       :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
       :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'" 
       :searchStatsApi="'/ProfileWorklistList/getListStats'">
-    </ct-searchlist>
+    </ct-searchlist> -->
 
     <!-- <ct-searchlist :apiParam="para"
       :searchConditionApi="'/RightValueList/getLayoutOfSearch'" 
@@ -33,11 +33,11 @@
       :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'">
     </ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
+    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
       :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
       :searchStatsApi="'/PropertyRETList/getListStats'">
-    </ct-searchlist> -->
+    </ct-searchlist>
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyOFIList/getListOfSearchModel'"

package/src/centaline/api/index.js

@@ -128,7 +128,7 @@ Axios.defaults.maxContentLength = 400000;
 const api = {
   get(url, params, callback) {
     if (common.flagRouterSelf()) {
-      url = url + params.action;
+      url = url + (url.substr(-1)=='/'?'':'/') + params.action;
       params = params.para;
     }
     return Axios.get(url, params, {
@@ -143,7 +143,7 @@ const api = {
   },
   post(url, params, callback) {
     if (common.flagRouterSelf()) {
-      url = url + params.action;
+      url = url + (url.substr(-1)=='/'?'':'/') + params.action;
       params = params.para;
     }
     return Axios.post(url, params, {
@@ -245,7 +245,7 @@ const api = {
   },
   postHandler(url, params, scripts) {
     if (common.flagRouterSelf()) {
-      url = url + params.action;
+      url = url + (url.substr(-1)=='/'?'':'/') + params.action;
       params = params.para;
     }
     return Axios.post(url, params, {

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

@@ -273,7 +273,8 @@
       },
       rowClickHandle() {
         var self = this;
-        if(self.selectIndex!==self.$refs.table.model.selectIndex && self.$refs.table.model.rowSelectRouter){
+        if(self.selectIndex!==self.$refs.table.model.selectIndex && self.$refs.table.model.rowSelectRouter 
+        && this.sideBarStatus && this.sideBarStatus=='open'){
           self.selectIndex=self.$refs.table.model.selectIndex;
           self.rowCount=self.$refs.table.model.listData.length;
           self.sideBarApiParam = {};

package/src/centaline/dynamicSearchListTab/src/dynamicSearchListOne.vue

@@ -269,7 +269,8 @@
       },
       rowClickHandle() {
         var self = this;
-        if(self.selectIndex!==self.$refs.table.model.selectIndex && self.$refs.table.model.rowSelectRouter){
+        if(self.selectIndex!==self.$refs.table.model.selectIndex && self.$refs.table.model.rowSelectRouter 
+        && this.sideBarStatus && this.sideBarStatus=='open'){
           self.selectIndex=self.$refs.table.model.selectIndex;
           self.rowCount=self.$refs.table.model.listData.length;
           self.sideBarApiParam = {};

package/src/main.js

@@ -14,11 +14,11 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: "http://10.88.22.46:7070/max-uplink-api/v1/form/router",
-  // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
+  // baseUrl: "http://10.88.22.46:7070/max-uplink-api/v1/form/router",
+  baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
   // baseUrl: "http://10.25.10.67:9999/service-api/v1/form/router",
   // baseUrl: "http://10.25.10.67:8080/",
-  // baseUrl: "http://10.88.22.42:9999/v1/form/router", 
+  // baseUrl: "http://10.88.22.42:9999/service-api/v1/form/router", 
   // baseUrl: "http://10.88.22.69:8080/api/", 
   // baseUrl: "http://10.88.22.40:8080/api/",
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
@@ -51,14 +51,14 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '1ae3431d-8b29-4c75-9913-4b757dc2b2db',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjr0OgkAQhN9laza5n727XTtugcaHIBAgwcoIJBrju4tRO3u_YoqvmJk7LFsPB6i4NKSNR61dQKpSwLJJjFmZTXbJU-ZWPuCP-NJaS5JsrLGUpEiRPLJVRqWo1FS111xBAeP1DAcb2ZMzRqiAuVvfYie-xLaMl-N4-8e50zrvs8QSTHKCybkByU1hL-s7NJIMB6EwTAKPJwAAAP__.XDp1uvqZXzcBbrTwxD17-Og6ryO6IJ9eJQg56GMN3a0',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgjAURf-lMy-hfa-vfWxQ2sWPIDSUBCcjkGiM_64muLl7hjuc5dyHWvesGoXspI2sIVjyQKwtCKUEoWYWTDVi3w9yAD_my0AuSNtGB1R3DJRsBDEhAYrteoqt6yOrSpXbRTWaPVohFFOpZdwOUTv5iH0t11O5_-PceVveWTOJzMZP4DRmIGMIRiGCrH3O8zxOWFg9XwAAAP__.xlvqlKs_L6vjmyUCyclR8pyqLtX4oq9S7rnA86iH010',
         
         originalRequestURL: 'http://10.88.22.67:8080',
-        EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',
+        EstateInfo: '{"estateId":"2209201708108B8F50AB530A49EAA858","estateName":"U%E7%89%88%E6%B5%8B%E8%AF%95%E6%A5%BC%E7%9B%98%E7%82%B9%E4%BD%8D"}',
         estateId: '20210729104021C49F04B55C50F6AF58',
 
-        authObject: '{"currentEstate":{"estateId":"20170524095458338E35F467429530B4","estateName":"A%E5%AE%89%E5%B3%A6%E5%85%AC%E9%A6%86"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"665b7cc4bcb0c902a054498fdf23fab7","token":"","random":"dMxZQ","time":1682069635547,"sign":"a0604f3d4aa249de11ba42a563698b72"}',
-        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImUyMTkyOTJiLTFjZDQtNGRiOS04YjQ1LWFjMDA2Y2Q3ZWFjMSJ9.Ki5iSJ1hoVpdZ_K9NRScKe7IwXKk3JOGx-a02XWPPL1914jpPZQmS6S-DQ752zepOqKOTELTtznMHGjw4cUUcw',
+        authObject: '{"currentEstate":{"estateId":"2209201708108B8F50AB530A49EAA858","estateName":"U%E7%89%88%E6%B5%8B%E8%AF%95%E6%A5%BC%E7%9B%98%E7%82%B9%E4%BD%8D"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"ce04f173da7df2e78a9da25595111387","token":"","random":"xISAbR","time":1683364729084,"sign":"ceb09a67fc50aa89aafcb2d435e4b41c"}',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjExZDZkYWM3LWUxZjgtNDExZS1hNzFmLTFiNjIwNTk0OTFlNyJ9.dJKIU1UNLLjf9FHtfntmSHR4VacBkPLnsbfSKMUvAjzpEgrggU8j0YY6yFZTP8VHIPAZN4b_yfB7r3S5BnRKEA',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作