centaline-data-driven 1.4.77 → 1.4.79

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.4.77",
+  "version": "1.4.79",
   "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="'/PropertyPublish/readDetail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/system/menuright/readDetail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          publishID: "1637690032707997696", actionType: 3
+          "menuRightId":"1642779661559795712","actionType":3
         },
         topHeight:10,
       }

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

@@ -177,7 +177,7 @@
           <div class="contacts-info base-box">
             <ct-contactList v-if="model.contactApiRouter !== null"  :apiRouter="model.contactApiRouter" :key="'contact' + refershKey"></ct-contactList>
           </div>
-          <div class="tablist-info base-box">
+          <div class="tablist-info base-box" style="padding-bottom: 0px;">
             <div class="details-tabs-box">
               <!--计算占用宽度-->
               <div style="position: relative">
@@ -222,7 +222,7 @@
                   </div>
                 </div>
                 <ct-searchlist v-if="model.searchConditionApiTags1" :key="'list' + listKey.toString() + refershKey"
-                  style="min-height: 420px" :apiParam="model.paramDataTags1" :flagFocus="false"
+                  :pageHeight="'450px'" :from="'detail'" :apiParam="model.paramDataTags1" :flagFocus="false"
                   :searchConditionApi="model.searchConditionApiTags1" :searchDataApi="model.searchDataApiTags1">
                 </ct-searchlist>
               </div>

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

@@ -178,7 +178,7 @@
           <div class="contacts-info base-box">
             <ct-contactList v-if="model.contactApiRouter !== null" :apiRouter="model.contactApiRouter" :key="'contact' + refershKey"></ct-contactList>
           </div>
-          <div class="tablist-info base-box">
+          <div class="tablist-info base-box" style="padding-bottom: 0px;">
             <div class="details-tabs-box">
               <!--计算占用宽度-->
               <div style="position: relative">
@@ -224,8 +224,9 @@
                     </el-dropdown>
                   </div>
                 </div>
-                <ct-searchlist v-if="model.searchConditionApiTags1" :key="'list' + listKey.toString() + refershKey" style="min-height: 420px"
-                  :apiParam="model.paramDataTags1" :flagFocus="false" :searchConditionApi="model.searchConditionApiTags1" :searchDataApi="model.searchDataApiTags1">
+                <ct-searchlist v-if="model.searchConditionApiTags1" :key="'list' + listKey.toString() + refershKey"
+                  :pageHeight="'450px'" :from="'detail'" :apiParam="model.paramDataTags1" :flagFocus="false" 
+                  :searchConditionApi="model.searchConditionApiTags1" :searchDataApi="model.searchDataApiTags1">
                 </ct-searchlist>
               </div>
             </div>

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

@@ -1,8 +1,9 @@
 <template>
   <div class="ct-form-list" v-focus="foucus" :class="{'tableDisabled':model.tableDisabled}">
-    <div v-if="model.create || (model.selectRouter && model.selectRouter.id)" class="list-title">
+    <div v-if="model.title" class="list-title">
       <h5>{{model.title}}</h5>
     </div>
+    <div v-else-if="model.create || (model.selectRouter && model.selectRouter.id)" class="list-title"></div>
     <div class="list-button">
       <component v-if="model.selectRouter!==null" :is="model.selectRouter.is" :vmodel="model.selectRouter" @click="popupSearchListHandle" ></component>
       <el-button v-if="model.create" :disabled="model.disabled" type="success" class="max-btn-add" style="width: auto;" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">
@@ -129,7 +130,7 @@
       this.model = this.vmodel;
       this.model.OptApi = this.api;
       this.model.$self=self;
-
+      
       this.$nextTick(function () {
         self.model.refField = this.$refs.Fields;
         self.model.refFieldsLabel = this.$refs.FieldsLabel;

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" :documentWidth="documentWidth" :flagPopupSearchlist="flagPopupSearchlist" 
+      @loaded="tableLoaded" :documentWidth="documentWidth" :flagPopupSearchlist="flagPopupSearchlist" :screenTop="screenTop"
       @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate" 
       @rowClickHandle="rowClickHandle" @scrollHandle="scrollHandle" @refreshRowHandle="refreshRowHandle" @doClosePopoverHandle="doClosePopoverHandle" 
       @showTitle="showTitleHandler" @popupClickHandler="popupClickHandler"></ct-searchtable>      
@@ -107,6 +107,7 @@
         title:'',
         showTitle:false,
         screenPara:null,
+        screenTop:0,
         reloadKey:0,
         reloadKeyScreen:'s0',
         reloadKeyTable:'t0',
@@ -133,6 +134,9 @@
     methods: {
       screenLoaded(defaultSearch) {
         this.loaded.screenLoaded = true;
+        if(this.from && this.from=='detail'){
+          this.screenTop=this.$refs.screen.$el.offsetTop;
+        }
         this.$refs.table.searchComplate(this.$refs.screen.model, defaultSearch);
  
         this.$emit('loaded', this.$refs.screen.model);

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

@@ -217,6 +217,10 @@ export default {
       Boolean,
       default: false,
     },
+    screenTop: {
+      Number,
+      default: 0,
+    },
   },
   computed: {},
   data() {
@@ -625,6 +629,9 @@ export default {
           this.$refs.searchTable.parentElement && !self.isLayout) {
           var h1 = this.$refs.searchTable.parentElement.offsetHeight | 0;
           var h2 = this.$refs.searchTable.offsetTop | 0;
+          if(this.from && this.from=='detail'){
+            h2=h2-this.screenTop-22;
+          }
           var h3 = this.$refs.toolbar.$el.offsetHeight | 0;
           var h4 = this.$refs.footer.$el.offsetHeight | 0;
           var h5 = this.$refs.listHeader ? (this.$refs.listHeader.$el.offsetHeight + 8) | 0 : 0;

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

@@ -566,15 +566,7 @@ const FormList = function (source, master) {
               })
               if(countKey===rtn.primaryKeys.length){
                 flagAdd=false;
-                if(iRow.deleted){
-                  if(rtn.disabled){
-                    Vue.prototype.$message({
-                      message: '已超过最大数量，不能新增！',
-                      type: 'error',
-                      showClose:true,
-                    });
-                    return;
-                  }
+                if(iRow.deleted){                  
                   rtn.tableData.forEach((d,index) => {
                     if(d.$sourceIndex===r.$sourceIndex){
                       rtn.tableData.splice(index, 1);
@@ -606,6 +598,14 @@ const FormList = function (source, master) {
                     rtn.tableData.splice(tableDataIndex, 1,rowData);
                   }
                   else{
+                    if(rtn.disabled){
+                      Vue.prototype.$message({
+                        message: '已超过最大数量，不能新增！',
+                        type: 'error',
+                        showClose:true,
+                      });
+                      return;
+                    }
                     rtn.tableData.push(rowData);
                   }
                 }

package/src/main.js

@@ -48,14 +48,14 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '3ba3f510-93fd-4103-9249-73c13f3f6fc2',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEzjsOwjAQRdG9uM5I4_l5TOfEScMiUAJBggoRkECIvRPEImhPcd97heU-hU3IlMxFGLq-ZZBaErQWETrLRYsXslZ3NmglSgk4DQ5dRAaiUgG9poErZ0u4q5KL01paaS1R7MFbLkAqLjyo5KShCfPjEjbRHInEEZtwGm8_iOzyhfsyX7fz8x_nzrfTOjuKHYx0AjdGENQMeZoc9nhUjhzjqBjeHwAAAP__.IhtJ2XWmn0L1rSDetKc8BClKlOEBZl6GWM0s2TfbR1k',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjksKwjAURfeScR8kL3mfdJY27cRFlGoj6EhsC4q4dyMuwunhcs59mXU_mtZEFNYQPPRD5yHkJNCxs9BzTJQ0IXc08UgZUQS8jAq9sx4QUwarWUaffWSxUw4xKVZTRdWEbgDtfAKkoMGPFKKQaUx53EzrWC0LIWNjLvP2A6SqX7Cv5X4oz3-cu26XmuX5jEqzgBW0EBYVUJ4Zllh3XIo7cTHvDwAAAP__.4lx6u0EiJkrxVVQIfeqtEHEFeZFzgJEr_ixHVXLr_jM',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',
         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":"bb71c2cdc14b4e186f76e41cb67881c4","token":"","random":"tZ45b9","time":1676355606718,"sign":"0509bb7ae0184c9262ff50ff40f03cfd"}',
-        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImY5NmZkZTBiLTQyYWEtNGJhZS04YWUwLWQ5OTBkM2Q2NTQ3OSJ9.0Nq41IzMfnDrYNaW85csIB7ra35DqsUBuHtqVTr5Wcwg1bNm_td-KO-_g2geYm8MuERiQhDq3uC-fOB95vUPrQ',
+        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":"eda28bfc7834adab4b7727a1b6b18de1","token":"","random":"Ysx7Qd","time":1680570830491,"sign":"a06775af9aa7d46367edee9fa8ae1901"}',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjgzMmUxYTdjLWRlNjctNGFhYS05Y2QzLTliNTFhOTExN2I0ZCJ9.MDyjc6gRDJOOSJP-yfINobpg2sSev1W3eNFUJ8HuIurya_OpKIi4mBJWb8dQEHhLvQYrPl1fgJ6oTa9XIY9bwg',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作