centaline-data-driven 1.4.72 → 1.4.74

package/package.json

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

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

@@ -246,7 +246,7 @@
           </div>
         </div>
         <!-- 右侧委托信息 -->
-        <div ref="midr" class="mid-r" style="width: 420px">
+        <div ref="midr" class="mid-r" style="width: 360px">
           <div class="take-info base-box" style="padding: 10px;font-size: 14px;">
             <el-row>
               <el-col :span="8" style="text-align: center;border-right: 1px solid #e0e0e0;">
@@ -1563,7 +1563,7 @@ export default {
         }
       }
       .staff-info {
-        padding-bottom: 10px;
+        padding: 10px;
         .open-mero {
           text-align: center;
           padding: 3px 0;
@@ -1616,11 +1616,11 @@ export default {
       .operation-table {
         padding: 0;
         .table-box {
-          display: flex;
+          display: -webkit-box;
           // align-items: center;
           border-bottom: 1px solid #e0e0e0;
           .t-item {
-            padding: 5px 16px;
+            padding: 5px 8px;
             font-size: 14px;
             flex: 1;
             position: relative;

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

@@ -247,7 +247,7 @@
           </div>
         </div>
         <!-- 右侧委托信息 -->
-        <div ref="midr" class="mid-r" style="width: 420px">
+        <div ref="midr" class="mid-r" style="width: 360px">
           <div class="take-info base-box" style="padding: 10px;font-size: 14px;">
             <el-row>
               <el-col :span="8" style="text-align: center;border-right: 1px solid #e0e0e0;">
@@ -1575,7 +1575,7 @@ export default {
         }
       }
       .staff-info {
-        padding-bottom: 10px;
+        padding:10px;
         .open-mero {
           text-align: center;
           padding: 3px 0;
@@ -1628,11 +1628,11 @@ export default {
       .operation-table {
         padding: 0;
         .table-box {
-          display: flex;
+          display: -webkit-box;
           // align-items: center;
           border-bottom: 1px solid #e0e0e0;
           .t-item {
-            padding: 5px 16px;
+            padding: 5px 8px;
             font-size: 14px;
             flex: 1;
             position: relative;

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

@@ -43,7 +43,7 @@
             </el-table-column>
 
             <!--操作列-->
-            <el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0">
+            <el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0" :render-header="renderHeader" :min-width="tableColumnWith">
               <template slot-scope="scope">
                 <span v-if="scope.row.edit || scope.row.isSet" class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="saveRow(scope.row,scope.$index,true)">
                   {{scope.row.isSet?'保存':"修改"}}
@@ -130,7 +130,7 @@
       },
       //添加账号
       addRow() {
-        var app = this;
+          var app = this;
         if (app.model.dialogEdit) {
           app.model.addRow(() => {
             app.$forceUpdate();
@@ -204,7 +204,7 @@
               app.model.currentRow.isSet = false;
               app.itemKey = Math.random();
               this.model.change = this.model.formListChange;
-              app.$emit('change');
+              app.$emit('change');          
             }
           }
         }
@@ -215,7 +215,7 @@
           app.model.currentRow.isSet = true;
           row.isSet = true;
           app.itemKey = Math.random();
-        }
+        }     
       },
       //删除
       deleteRow(index, sourceIndex) {
@@ -410,8 +410,8 @@
         span.style.width = 'auto';
         // 临时插入 document
         document.body.appendChild(span);
-        // 重点：获取 span 最小宽度，设置当前列，注意这里加了 10，字段较多时还是有挤压，且渲染后的 div 内左右 padding 都是 5，所以 +10 。（可能还有边距/边框等值，需要根据实际情况加上）
-        column.minWidth = span.getBoundingClientRect().width + 10;
+        // 重点：获取 span 最小宽度，设置当前列，注意这里加了 35，字段较多时还是有挤压，且渲染后的 div 内左右 padding 都是 5，所以 +10 ,另外25是为了公布工号列不被遮挡。（可能还有边距/边框等值，需要根据实际情况加上）
+        column.minWidth = span.getBoundingClientRect().width + 35;
         this.tableColumnWith = column.minWidth
         // 移除 document 中临时的 span
         document.body.removeChild(span);

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

@@ -12,7 +12,7 @@
     </ct-tabletoolbar>
 
     <ct-tabletip ref="listHeader" class="ct-search-table-list-header ct-search-table-tag" :tip="model.listHeader"
-                 v-if="!isLoading && model"></ct-tabletip>
+                 v-if="!isLoading && model" @setTableHeight="setTableHeight"></ct-tabletip>
 
     <div v-loading="tableLoading" v-if="!isLoading && model"
          :style="{ height: '0px', top: model.tableHeight * 0.55 + 'px' }"></div>
@@ -311,7 +311,6 @@ export default {
       self.tableComplate = true;
       self.setTableHeight();
       this.selectAllType = this.model.getSelectAll();
-
       this.$nextTick(() => {
         self.loadStats();
         window.addEventListener("resize", (ev) => {
@@ -424,6 +423,7 @@ export default {
       }
     },
     getPage(index) {
+      
       var self = this;
       if (typeof self.$refs.tableParent !== "undefined") {
         self.$refs.tableParent.scrollTop = 0;

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

@@ -10,7 +10,17 @@ export default {
   },
   data() {
     return {}
-  }
+  },
+  watch: {
+    tip: function (val) {
+       let self=this;
+      this.$nextTick(function () {
+       self.$emit("setTableHeight");
+      })
+    }
+  },
+
+
 }
 </script>
 <style>