centaline-data-driven 1.3.81 → 1.3.83

package/package.json

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

package/src/SearchList.vue

@@ -11,8 +11,8 @@
       :searchStatsApi="'/ProfileWorklistList/getListStats'">
     </ct-searchlist> -->
 
-    <ct-searchlist :searchConditionApi="'/salemattersmanage/priceuploadlist/getLayoutOfSearch'" 
-      :searchDataApi="'/salemattersmanage/priceuploadlist/getList'">
+    <ct-searchlist :searchConditionApi="'/commissionmanage/PayedDetail/getLayoutOfSearch'" 
+      :searchDataApi="'/commissionmanage/PayedDetail/getList'">
     </ct-searchlist>
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"

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

@@ -1101,6 +1101,7 @@ export default {
       margin-left: auto;
       font-size: 12px;
       text-align: right;
+      min-width: 400px;
       .max-report {
         height: 26px;
         color: #333333;

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

@@ -1094,6 +1094,7 @@ export default {
       margin-left: auto;
       font-size: 12px;
       text-align: right;
+      min-width: 400px;
       .max-report {
         height: 26px;
         color: #333333;

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

@@ -13,7 +13,7 @@
             <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara" 
                       :fileData="getFileData(col)" :from="'form'" :documentHeight="documentHeight" :documentWidth="documentWidth"
                        @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
-                       @input="inputHandler(col,$event)" @importComplete="importComplete"
+                       @input="inputHandler(col,$event)" @importComplete="importComplete" @blur="blurHandler(col,$event)"
                        @popupSearchList="popupSearchListHandler"
                        @tableButtonClick="clickHandler"></component>
           </el-col>
@@ -28,7 +28,7 @@
                 <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara" 
                            :fileData="getFileData(col)" :from="'form'" :documentHeight="documentHeight" :documentWidth="documentWidth"
                            @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
-                           @input="inputHandler(col,$event)" @importComplete="importComplete"
+                           @input="inputHandler(col,$event)" @importComplete="importComplete" @blur="blurHandler(col,$event)"
                            @popupSearchList="popupSearchListHandler"
                            @tableButtonClick="clickHandler"></component>
               </el-col>
@@ -48,7 +48,7 @@
                 <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara" 
                            :fileData="getFileData(col)" :from="'form'" :documentHeight="documentHeight" :documentWidth="documentWidth"
                            @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
-                           @input="inputHandler(col,$event)" @importComplete="importComplete"
+                           @input="inputHandler(col,$event)" @importComplete="importComplete" @blur="blurHandler(col,$event)"
                            @popupSearchList="popupSearchListHandler"
                            @tableButtonClick="clickHandler"></component>
               </el-col>
@@ -61,8 +61,8 @@
           <el-col v-for="(col, index) in independentItem" :key="index" v-if="col.show !== false" :span="col.colspan" style="padding:5px">
             <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara" 
                        :fileData="getFileData(col)" :from="'form'" :documentHeight="documentHeight" :documentWidth="documentWidth"
-                       @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)"
-                       @input="inputHandler(col,$event)" @importComplete="importComplete"
+                       @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
+                       @input="inputHandler(col,$event)" @importComplete="importComplete" @blur="blurHandler(col,$event)"
                        @popupSearchList="popupSearchListHandler"
                        @tableButtonClick="clickHandler"></component>
           </el-col>
@@ -614,7 +614,7 @@
         self.model.requiredHandle(field);
         //self.model.validMrf(field);
 
-        if(field.onAfterChanged){
+        if(field.onAfterChanged && field.type!==4){
           var router =self.model.actionRouters.find((v) => {
             return v.id === field.onAfterChanged;
           });
@@ -623,6 +623,16 @@
 
         self.$forceUpdate();
       },
+      blurHandler(field) {
+        var self = this;
+        if(field.onAfterChanged){
+          var router =self.model.actionRouters.find((v) => {
+            return v.id === field.onAfterChanged;
+          });
+          self.clickHandler(router);
+        }
+        self.$forceUpdate();
+      },
       enterHandler(field) {
         var self = this;
         if (typeof field.change !== 'undefined') {

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

@@ -15,8 +15,8 @@
         <el-col :span="24">
           <el-table size="mini" class="max-table--border" :data="model.tableData" :key="itemKey" border 
             style="width: 100%" highlight-current-row :show-summary="model.showSummary" :summary-method="getSummaries">
-            <!--数据列-->
-            <el-table-column v-for="(v,i) in model.rows[0].field" :key="i" :prop="v.id" :label="v.label" v-if="v.show !== false">
+             <!--数据列-->
+            <el-table-column v-for="(v,i) in model.rows[0].field" :key="i" :prop="v.id" :label="v.label" v-if="v.show !== false" :render-header="renderHeader" :min-width="tableColumnWith">
               <template slot="header" slot-scope="scope">
                 <div :class="[{'ct-table-required':v.required&&model.rows[0].edit&& model.rows[0].delete&&!model.tableDisabled},getHeadClass(v)]">
                   {{v.label}}
@@ -104,6 +104,7 @@
         model: null,
         foucus: false,
         itemKey: Math.random(),
+		 tableColumnWith: 0
       }
     },
     created() {      
@@ -373,7 +374,24 @@
         });
 
         return sums;
-      }
+      },
+	  // 表头部重新渲染
+    renderHeader(h, { column, $index }) {
+      // 新建一个 span
+      let span = document.createElement('span');
+      // 设置表头名称
+      span.innerText = column.label;
+      span.style.whiteSpace = 'nowrap';
+      span.style.width = 'auto';
+      // 临时插入 document
+      document.body.appendChild(span);
+      // 重点：获取 span 最小宽度，设置当前列，注意这里加了 10，字段较多时还是有挤压，且渲染后的 div 内左右 padding 都是 5，所以 +10 。（可能还有边距/边框等值，需要根据实际情况加上）
+      column.minWidth = span.getBoundingClientRect().width + 10;
+      this.tableColumnWith = column.minWidth
+      // 移除 document 中临时的 span
+      document.body.removeChild(span);
+      return h('span', column.label);
+    }
     }
   }
 </script>
@@ -424,4 +442,11 @@
     pointer-events: none;
     opacity:0.4;
   }
+  .has-gutter>tr>th>.cell>span {
+  width: auto;
+  white-space: nowrap;
+}
+.el-table .cell {
+  text-overflow: clip;
+}
 </style>

package/src/centaline/dynamicInputNumber/src/dynamicInputNumber.vue

@@ -71,6 +71,7 @@
         this.model.value = '';
         this.inputHandler(this.model.value);
         this.changeHandler(this.model.value);
+        this.$emit('blur',event);
         this.isShowClear();
         event.stopPropagation();
       },
@@ -90,6 +91,7 @@
       onBlurHandler:function(event){
         this.model.value = this.$common.numToFloat(this.model.value, this.model.decimals);//保留n位小数
         this.inputHandler();
+        this.$emit('blur', event);
       },
       //不能共用的数据校验
       selfValidExcute: function (eventName) {

package/src/main.js

@@ -12,9 +12,9 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  // baseUrl: "http://10.88.22.46:7070/v1/form/router",
+  baseUrl: "http://10.88.22.46:7070/v1/form/router",
   // baseUrl: "http://10.88.23.25:9999/v1/form/router",
-  baseUrl: "http://10.25.10.63:9999/v1/form/router", 
+  // baseUrl: "http://10.88.22.44:9999/v1/form/router", 
   // baseUrl: "http://10.88.22.40:8080/", 
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // flagRouterSelf: true,
@@ -43,14 +43,14 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '42ccd644-040d-4e01-9521-1623f1884058',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZPswDC7Q6cLNh6CrOtugpURSDTGu6sROnpf8YrX_P-EcT5BA3YBN7TS6wJuaKUnYrUkHe7UemThCh15h57F86HtKr9voYB0v0JDIixGykoKGML0CzWp-4Z5TLdjevzj3GUaPrPKQbmsDaZAZ-Q6ZwxOHRqV6HIkiinD6w0AAP__.wPEHSZ2zu23Cf4v2l_KHdhstyAgBFY54UciD69X-TgM',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZMwu7Mzu3S6YOMhiLJLgpURSDTGu6sROnpf8YrX_P-EcT5DBbqAG1ppwwJuaKUl4qAkDe6CRmRhi56ix8gS-VA3Nu5rKCDfr1CRiFMTStUChtP0C8JGvmEe8-2YH_84d5mGz2xylpLVEl1vLLJ2jN4yofSd4ySp987A6w0AAP__.9uhpYoqF1t3tbW9zybuYmXjHostyhq8fMZb___MoVd0',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',
         estateId: '20210729104021C49F04B55C50F6AF58',
 
         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":""}',
-        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImUzOWE4NDQwLTYwYTYtNDI0MC05Y2QzLTBlMmRmNWYyNDEzOSJ9.w3aKWpGoMFfx1haNo8FSiZrdbS9dXZM60FJw43tBRgrV2uSRJubJ6ec5FaYSs-O9empUtP577jEsjpvG1Msuyw',
+        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjdiMzUxY2QyLWE3ZTctNDdlNi05NGM1LTM1YmUwNWM1NjYzNCJ9.FpN_FJqya2oewIkrwlCgzeFu7bk_kCoKrgOxd5rqVIx8FgF7OyWq72rNpuhrsWnsnUF9WwqfVa98jTVuR4EPbQ',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作