centaline-data-driven 1.3.60 → 1.3.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.3.60",
+  "version": "1.3.63",
   "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="'/PropertyChanceTipOff/getLayoutOfNew'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/CCAIWorklist/getLayoutOfAudit'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-         chanceID: "1526015051042000896", actionType: 2
+          worklistID: "14749_39", actionType: 2
         },
         topHeight:10,
       }

package/src/SearchList.vue

@@ -4,19 +4,22 @@
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
     
-    <!-- <ct-searchlist :searchConditionApi="'/ProfileWorklistList/getLayoutOfSearch'" 
-    :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
-    :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'" :apiParam="para"></ct-searchlist> -->
+    <ct-searchlist :apiParam="para"
+      :searchConditionApi="'/ProfileWorklistList/getLayoutOfSearch'" 
+      :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
+      :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'" 
+      :searchStatsApi="'/ProfileWorklistList/getListStats'">
+    </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/dynamicCb/src/dynamicCb.vue

@@ -70,7 +70,10 @@
     padding-bottom: 3px;
     padding-top: 3px;
   }
-  .line-feed {
+ .ct-form .line-feed {
   white-space: normal;
 }
+.ct-checkbox .ct-radios .el-checkbox {
+    min-width: 0px;
+}
 </style>

package/src/centaline/dynamicContact/src/dynamicContact.vue

@@ -276,15 +276,17 @@ export default {
           }
           else {
             field.doAction(submitData, (data) => {
-              self.model.doAction(data, field);
-              if (callBack) {
-                callBack();
-              }
-              if(field.isRefersh){
-                self.loaderObj.Contact(data, null, self.load);
-              }
-              else if (field.isCallTel){
-                self.$refs['router' + field.id][0].callTelClick(data);
+              if (data.rtnCode === 200) {
+                self.model.doAction(data, field);
+                if (callBack) {
+                  callBack();
+                }
+                if(field.isRefersh){
+                  self.loaderObj.Contact(data, null, self.load);
+                }
+                else if (field.isCallTel){
+                  self.$refs['router' + field.id][0].callTelClick(data);
+                }
               }
             })
           }

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

@@ -916,21 +916,11 @@ export default {
           } 
           else if (field.isFormPageInTab) {// 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
-            self.$common
-              .getDataDrivenOpts()
-              .handler.openTab(
-                field.action,
-                submitData,
-                field.pageTitle,
-                self.model,
-                field.dialogWidth
-              );
+            self.$common.getDataDrivenOpts().handler.openTab(field.action,submitData,field.pageTitle,self.model,field.dialogWidth);
           } 
           else if (field.isSearchPageInTab) {// 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
-            self.$common
-              .getDataDrivenOpts()
-              .handler.openTabSearch(field, submitData);
+            self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
           } 
           else if (field.isBrowserNewTab) {// 浏览器打开
             submitData = field.getActionPara(submitData).para;
@@ -945,9 +935,11 @@ export default {
           } 
           else {
             field.doAction(submitData, (data) => {
-              self.model.doAction(data, field);
-              if (callBack) {
-                callBack(field);
+              if (data.rtnCode === 200) {
+                self.model.doAction(data, field);
+                if (callBack) {
+                  callBack(field);
+                }
               }
             });
           }

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

@@ -946,15 +946,7 @@ export default {
           } 
           else if (field.isFormPageInTab) {// 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
-            self.$common
-              .getDataDrivenOpts()
-              .handler.openTab(
-                field.action,
-                submitData,
-                field.pageTitle,
-                self.model,
-                field.dialogWidth
-              );
+            self.$common.getDataDrivenOpts().handler.openTab(field.action,submitData,field.pageTitle,self.model,field.dialogWidth);
           } 
           else if (field.isSearchPageInTab) {// 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
@@ -973,9 +965,11 @@ export default {
           } 
           else {
             field.doAction(submitData, (data) => {
-              self.model.doAction(data, field);
-              if (callBack) {
-                callBack(field);
+              if (data.rtnCode === 200) {
+                self.model.doAction(data, field);
+                if (callBack) {
+                  callBack(field);
+                }
               }
             });
           }

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -481,19 +481,21 @@
               else {
                 submitData = field.getActionPara(submitData).para;
                 field.doAction(submitData, (data) => {
-                  if(field && field.changeCallBackFunName){
-                    self.changeCallBackHandler(field, field.changeCallBackFunName, data.content);
-                  }
-                  else if(field.isRefersh){
-                    self.collapse.splice(0, self.collapse.length);
-                    self.collapseActiveNames.splice(0, self.collapseActiveNames.length);
-                    self.collapseFieldsRow.splice(0, self.collapseFieldsRow.length);
-                    self.independentItem.splice(0, self.independentItem.length);
-                    self.load(self.loaderObj.Form(data.content));
-                    self.formKey=self.formKey+1;
-                  }
-                  else{
-                    self.model.doAction(data);
+                  if (data.rtnCode === 200) {
+                    if(field && field.changeCallBackFunName){
+                      self.changeCallBackHandler(field, field.changeCallBackFunName, data.content);
+                    }
+                    else if(field.isRefersh){
+                      self.collapse.splice(0, self.collapse.length);
+                      self.collapseActiveNames.splice(0, self.collapseActiveNames.length);
+                      self.collapseFieldsRow.splice(0, self.collapseFieldsRow.length);
+                      self.independentItem.splice(0, self.independentItem.length);
+                      self.load(self.loaderObj.Form(data.content));
+                      self.formKey=self.formKey+1;
+                    }
+                    else{
+                      self.model.doAction(data);
+                    }
                   }
                 },self.model.scripts);
               }

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

@@ -22,7 +22,7 @@
           <ul class="btnTab">
             <li
               :class="[
-                selectStats == item.code1 + '*' + item.controlLabel
+                selectStats == item.fieldName1 + '*' + item.code1 
                   ? 'activecolor'
                   : '',
               ]"
@@ -32,7 +32,7 @@
             <li class="tdcenter">
               <span
                 :class="[
-                  selectStats == item.code1 + '*' + item.controlLabel
+                  selectStats == item.fieldName1 + '*' + item.code1 
                     ? 'active'
                     : '',
                 ]"
@@ -49,7 +49,7 @@
           <ul class="btnTab">
             <li
               :class="[
-                selectStats == item.code1 + '*' + item.controlLabel
+                selectStats ==item.fieldName1 + '*' + item.code1 
                   ? 'activecolor'
                   : '',
               ]"
@@ -59,7 +59,7 @@
             <li class="tdcenter">
               <span
                 :class="[
-                  selectStats == item.code1 + '*' + item.controlLabel
+                  selectStats == item.fieldName1 + '*' + item.code1 
                     ? 'active'
                     : '',
                 ]"
@@ -87,7 +87,7 @@
               <ul class="popoverbtnTab" style="padding: 0px">
                 <li
                   :class="[
-                    selectStats == item.code1 + '*' + item.controlLabel
+                    selectStats == item.fieldName1 + '*' + item.code1 
                       ? 'activecolor'
                       : '',
                   ]"
@@ -97,7 +97,7 @@
                 <li class="tdcenter">
                   <span
                     :class="[
-                      selectStats == item.code1 + '*' + item.controlLabel
+                      selectStats == item.fieldName1 + '*' + item.code1 
                         ? 'active'
                         : '',
                     ]"
@@ -161,13 +161,14 @@ export default {
       self.data = data.source.content;
       self.selectVa = "";
       if (self.data.length > 0) {
+
         let i = self.data.findIndex(
-          (v) => self.selectStats === v.code1 + "*" + v.controlLabel
+          (v) => self.selectStats === v.fieldName1 + "*" + v.code1 
         );
 
         if (i == -1 || self.selectStats == []) {
           self.selectStats =
-            self.data[0].code1 + "*" + self.data[0].controlLabel;
+            self.data[0].fieldName1 + "*" + self.data[0].code1;
         }
         self.FlagStatistics = true;
         self.showStats();
@@ -215,7 +216,7 @@ export default {
     },
     handleClick(ev, obj) {
       var self = this;
-      self.selectStats = obj.code1 + "*" + obj.controlLabel;
+      self.selectStats = obj.fieldName1 + "*" + obj.code1 
       var fields = self.model.searchData(
         obj.fieldName1,
         obj.code1,

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

@@ -388,11 +388,6 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
             rowNum = rowNum ? rowNum : data.listData.currentRowIndex;
 
             if (data) {
-                if (data.field) {
-                  data.field.source[attrName] = value;
-                  data.listData.updateListField(data.listData.$self.$refs.FieldsLabel, data.listData.source.rows[rowNum].$sourceIndex, fiedlId);
-                }
-
                 //正在编辑的行
               if (data.listData.currentRow.data && data.listData.currentRow.data[fiedlId] && rowNum>-1
                 && data.listData.currentRow.data.$sourceIndex === data.listData.source.rows[rowNum].$sourceIndex) {
@@ -407,6 +402,10 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
                         currentField.self.$forceUpdate();
                     }
                 }
+                else if (data.field) {
+                  data.field.source[attrName] = value;
+                  data.listData.updateListField(data.listData.$self.$refs.FieldsLabel, data.listData.source.rows[rowNum].$sourceIndex, fiedlId);
+                }
 
                 //如果有汇总列，触发重新计算汇总
                 if (data.listData.showSummary) {

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

@@ -267,9 +267,7 @@ const Router = function (source) {
     doAction(data, callback, scripts) {
       if (rtn.action) {
         Vue.prototype.$api.postHandler(common.globalUri(), rtn.getActionPara(data), scripts).then((response) => {
-          if (response.rtnCode === Enum.ReturnCode.Successful) {
-            callback(response);
-          }
+          callback(response);
         }).catch((ex) => {
           // callback(ex); //里面需要有data.rtnCode === 200的处理
         });

package/src/main.js

@@ -41,8 +41,8 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '77791819-ac7d-4a5d-bd16-5278b9f0b5d7',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgkAQRP9lazZhub3dOzo9sPEjyAFngpURSDTGfxcjdPS-4hWTTGZeMM4tlKAruKONxq_gjjYaIvZKUuPBa0AWNugoOAwsgU9VbcKxggzS4wYliZA3yjlnMMTpFzhL-TeYx3Q_p-c_zl2nYZkVTX2h0WDXakTO-wLdxdul4anrbexsEnh_AAAA__8.MEtSxad4sPrz3kQNLxWCgE6EQtonJes5uYAZ_QZYDTU',
+        oldToken: 'd3513834-dcd1-4056-b094-53c484d7057f',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZPsLLOzO3S6YOMhCO5igpURSDTGu6sROnpf8YrX_P-EcT5BBX4BN7TS6gJuaKUlYvUkDe7UR2ThEgPFgJEl8qFuyrivoYD-foWKRCyJU-sLGLrpF4xX9w3z2N-O_eMf5y7T8JkVn3PSzmHuyox8JoOabULjWJMhqyEFeL0BAAD__w.47czHbw7UgnOOWKn9Y0hd1pyImZskX5vJM6iWUy5s20',
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',
         estateId: '20210729104021C49F04B55C50F6AF58',