centaline-data-driven 1.4.36 → 1.4.37

package/package.json

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

package/src/SearchList.vue

@@ -4,12 +4,12 @@
 
     <!-- <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 :apiParam="para"
       :searchConditionApi="'/PropertyTrustList/getLayoutOfSearch'" 
@@ -22,11 +22,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/css/max.css

@@ -112,7 +112,6 @@
     border-bottom-left-radius: 6px !important;
     border-bottom-right-radius: 6px !important;
     -webkit-box-shadow: #cfcece 0px  7px 9px 0px!important;
-
 }
 .ct-checkbox .ct-checkbox-mian{
     padding-left: 0!important;

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

@@ -11,14 +11,14 @@
       <div class="shortcutFollow max-shortcutFollow" style="padding-left: 20px;" v-if="model.shortcutForm">
         <ct-form :source="model.shortcutForm.code1" @submit="saveShortcut"></ct-form>
       </div>
-      <el-popover class="SeachScreenPop max-seachpopper" placement="top" transition="el-zoom-in-top" v-model="highScreen" trigger="click" visible-arrow="false">
+      <div class="SeachScreenPop max-seachpopper" placement="top" transition="el-zoom-in-top" v-show="highScreen" trigger="click" visible-arrow="false">
         <div style="width:100%">
           <template v-for="(col, index) in highScreenRow" v-if="col.show !== false">
             <br v-if="col.is === 'ct-linefeed'" />
             <component v-else class="list-field" v-bind="col.listBind" :is="col.is" :vmodel="col" :api="model.optionApi" @click="clickHandler(col)"></component>
           </template>
         </div>
-      </el-popover>
+      </div>
     </div>
     <div v-if="isLoading" v-loading="isLoading" style="min-height:100px">
     </div>
@@ -205,5 +205,15 @@
   .ct-ptl0 {
     padding: 0 10px 10px 10px;
   }
-
+  .max-seachpopper {
+    position: absolute;
+    z-index: 9999;
+    width: 100%;
+    padding: 5px 10px 10px 10px!important;
+    background-color: #fff !important;
+    margin-top: -5px;
+    border-bottom-left-radius: 6px !important;
+    border-bottom-right-radius: 6px !important;
+    -webkit-box-shadow: #cfcece 0px  7px 9px 0px!important;
+}
 </style>

package/src/centaline/dynamicTree/src/dynamicTree.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class='mytree' style="overflow:auto">
+  <div class='mytree' style="overflow:auto" :style="{height:treeHeight}">
       <el-tree :data="treeData" class="tree-line" :props="defaultProps" :load="loadNode" :indent="0"
         :expand-on-click-node="false" @node-click="handleNodeClick" lazy ref="Tree">
       </el-tree>
@@ -34,9 +34,13 @@ export default {
         isLeaf: "isLeaf",
         id: 'code'
       },
+      treeHeight:'100%'
     };
   },
   methods: {
+    activated(){
+    this.treeHeight='100%';
+    },
     search(m) {
       this.treeNode.childNodes = [];
       this.searchComplate(m, undefined, this.treeResolve);
@@ -111,7 +115,8 @@ export default {
 </script>
 <style lang="scss">
 .mytree .is-select {
-  color: #409eff !important
+  color: #409eff !important;
+  height: 100%;
 }
 
 .tree-line:first-child div {

package/src/main.js

@@ -43,7 +43,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '9a73e482-db16-4a24-81e7-67daef02b64d',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrsOgkAQRf9laiaZYWdfdLpg40eQFYcEKyOQaIz_rkbo6D3FKU5z7xPG-QQV-AXc0EobF3BDKy2zRM-uwV30CcWJwcApYBKX5FA3Ju1rKEDvV6jYeS5FxJQFDHn6BbaBvmEe9XbUxz_OXabhM2ujNeQ7RSE6o0QizJ0ocu6You-1dxZebwAAAP__.vkp7C4-AbNZcFXOUNh7GhACgGYct_lCq8lYCyLOdfSg',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgkAQRP9laza59fZ27-j0wMaPIAeeCVZGINEY_12M0NH7ildMJpl5wTC1UIIu4IZWmrCAG1ppiDgoSY37oBFZ2KKn6DGyRD5WtY2HCgrIjxuUJHPTiFUtoE_jL3AUwjeYhnw_5ec_zl3Hfp7NZNRll7FN3iBb12G6dIwiGsRx2p07B-8PAAAA__8.znyY_zAn4f_Xdz-2UVSafJIf9z5zDANUKWzpMIPEJdA',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',