centaline-data-driven 1.3.68 → 1.3.69

package/package.json

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

package/src/SearchList.vue

@@ -4,16 +4,16 @@
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></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 :searchConditionApi="'/PropertyDutyList/getLayoutOfSearch'" 
+    <!-- <ct-searchlist :searchConditionApi="'/PropertyDutyList/getLayoutOfSearch'" 
       :searchDataApi="'/PropertyDutyList/getListOfSearchModelForRET'">
-    </ct-searchlist>
+    </ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"

package/src/centaline/dialogList/src/dialog.vue

@@ -152,7 +152,6 @@
                                     if(item.attrs.height){
                                       ph=parseInt(item.attrs.height.replace('px',''));
                                     }
-                                    
                                     if(item.attrs.documentHeight && item.attrs.documentHeight!='auto'){
                                       let dh=parseInt(item.attrs.documentHeight.replace('px',''));
                                       if(dh<ph){
@@ -167,6 +166,25 @@
                                         item.attrs.documentHeight=(self.vmodel.pane.$el.clientHeight-60)+'px';
                                       }
                                     }
+                                    //此行代码是为了防止弹出的窗口宽度 大于父级页面的宽度
+                                    var pw=0;
+                                    if(item.attrs.width){
+                                      pw=parseInt(item.attrs.width.replace('px',''));
+                                    }
+                                    if(item.attrs.documentWidth && item.attrs.documentWidth!='auto'){
+                                      let dw=parseInt(item.attrs.documentWidth.replace('px',''));
+                                      if(dw<pw){
+                                        item.attrs.width=item.attrs.documentWidth;
+                                      }
+                                    }
+                                    else if(self.vmodel.pane && self.vmodel.pane.$el){
+                                      if(self.vmodel.pane.$el.clientWidth<pw) {
+                                        item.attrs.width=(self.vmodel.pane.$el.clientWidth-20)+'px';
+                                      }
+                                      if(item.component=='ct-form'){
+                                        item.attrs.documentWidth=(self.vmodel.pane.$el.clientWidth-20)+'px';
+                                      }
+                                    }
                                     
                                     return h('div', {
                                       style: {

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

@@ -11,7 +11,7 @@
         <el-row v-if="collapseFieldsRow.length > 0">
           <el-col v-for="(col, index) in collapseFieldsRow[0]" :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"
+                      :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"
                        @popupSearchList="popupSearchListHandler"
@@ -26,7 +26,7 @@
             <el-row>
               <el-col v-for="(col, index) in collapseFieldsRow[index + 1]" :key="index" :span="col.colspan" v-if="col.show !== false" 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"
+                           :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"
                            @popupSearchList="popupSearchListHandler"
@@ -46,7 +46,7 @@
             <el-row>
               <el-col v-for="(col, index) in collapseFieldsRow[index + 1]" :key="index" :span="col.colspan" v-if="col.show !== false" 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"
+                           :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"
                            @popupSearchList="popupSearchListHandler"
@@ -60,7 +60,7 @@
         <el-row v-if="independentItem.length > 0" style="margin-top: 20px;">
           <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"
+                       :fileData="getFileData(col)" :from="'form'" :documentHeight="documentHeight" :documentWidth="documentWidth"
                        @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)"
                        @input="inputHandler(col,$event)" @importComplete="importComplete"
                        @popupSearchList="popupSearchListHandler"
@@ -114,6 +114,10 @@
         String,
         default: 'auto',
       },
+      documentWidth:{
+        String,
+        default: 'auto',
+      },
     },
     data() {
       return {
@@ -369,6 +373,7 @@
                       width: field.dialogWidth + 'px',
                       height: field.dialogHeight + 'px',
                       documentHeight:self.documentHeight,
+                      documentWidth:self.documentWidth,
                     },
                     on: {
                       submit(ev) {
@@ -716,6 +721,7 @@
               width: router.dialogWidth + 'px',
               height: (router.dialogHeight || 500) + 'px',
               documentHeight:self.documentHeight,
+              documentWidth:self.documentWidth,
             },
             on: {
               submit(option) {

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

@@ -13,7 +13,7 @@
       @showTitle="showTitleScreenHandler"></ct-searchscreen>
 
       <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" :from="from" :isIframe="isIframe" :documentHeight="documentHeight" 
-      @loaded="tableLoaded"
+      @loaded="tableLoaded" :documentWidth="documentWidth" 
       @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate" 
       @rowClickHandle="rowClickHandle" @scrollHandle="scrollHandle" @refreshRowHandle="refreshRowHandle" @doClosePopoverHandle="doClosePopoverHandle" 
       @showTitle="showTitleHandler"></ct-searchtable>
@@ -67,6 +67,10 @@
         String,
         default: 'auto',
       },
+      documentWidth:{
+        String,
+        default: 'auto',
+      },
     },
     created() {
       this.model = this.vmodel;

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

@@ -199,6 +199,10 @@ export default {
       String,
       default: 'auto',
     },
+    documentWidth:{
+      String,
+      default: 'auto',
+    },
   },
   computed: {},
   data() {
@@ -986,6 +990,7 @@ export default {
                       width: field.dialogWidth + "px",
                       height: field.dialogHeight + "px",
                       documentHeight:self.documentHeight,
+                      documentWidth:self.documentWidth,
                     },
                     on: {
                       submit(ev) {
@@ -1059,6 +1064,7 @@ export default {
                       width: field.dialogWidth + "px",
                       height: field.dialogHeight + "px",
                       documentHeight:self.documentHeight,
+                      documentWidth:self.documentWidth,
                     },
                     on: {
                       refreshParent() {

package/src/main.js

@@ -42,7 +42,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '42ccd644-040d-4e01-9521-1623f1884058',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgkAQRP9laza55fZ27-jkwMaPIIc5E6yMQKIx_rsYoaP3Fa-YYmZeMM49VKAruKONLqzgjjY6Ig5K0uIhaEQWtugpeowskY9Na2PdQAH5cYOKRGxpSmUpYEjTLyAS-w3mMd9P-fmPc9dpWGYlc--DJQxZDbJLbim7MNqg6pM7G-8Y3h8AAAD__w.8TSDAWjGFDnR0l_C7untDbZTxrfIYNVycj9F33X0v6E',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVby2rv-pCNOaDhEFBsXoUIkkUCIuwMi6dIzxRTTvPeEaUlQg1vBHW30YQV3tNETcXBkOzwEF5EtG_QUPUa2kY9tZ2LTQgXlfoWarDVakxWpYBzmXyAj-huWqdxO5fGPc5d5_MwGCUqS9phTUsisFQ5ZGSyFg850FhGG1xsAAP__._bIs6F-PKatDpGVpnwJkgA9y7oaWPycWYjSN5gFSsI8',
         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',