doway-coms 2.10.57 → 2.10.59

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "2.10.57",
+  "version": "2.10.59",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseForm/src/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div  :style="computedformStyle" class="form-container">
-    <a-button 
+    <a-button v-if="showFold===true"
       class="collapse-btn"
       type="link"
       @click="hiddenDetail = !hiddenDetail"
@@ -12,7 +12,7 @@
       :style="getFieldStyle(col)"
       v-for="(col,colIndex) in internalComputedHiddenCols"
       :key="col.field"
-      v-show="hiddenDetail ? colIndex === 0 : true"
+      v-show="hiddenDetail ? col.foldVisible===true : true"
     >
       <!-- 文本框输入控件 -->
       <BaseInput
@@ -326,10 +326,10 @@
       />
     </div>
     <template v-if="layoutType==='default'">
+    <!-- <div  class="d-form-item-ghost"></div>
     <div  class="d-form-item-ghost"></div>
     <div  class="d-form-item-ghost"></div>
-    <div  class="d-form-item-ghost"></div>
-    <div  class="d-form-item-ghost"></div>
+    <div  class="d-form-item-ghost"></div> -->
     </template>
   </div>
 </template>
@@ -374,6 +374,12 @@ export default {
   },
   name: 'BaseForm',
   props: {
+    showFold:{
+      type: Boolean,
+      default: function () {
+        return false
+      },
+    },
     layoutType: {
       // 布局方式。默认布局是flex自动换行布局，grid网格固定布局
       type: String,
@@ -440,10 +446,13 @@ export default {
     computedformStyle(){
       let layoutFormStyle = {
         display: 'flex',
+        columnGap: this.flexGap+ 'px',
+        rowGap:'7px',
         flexFlow: 'row wrap',
         justifyContent: 'flex-start',
         padding: '5px 5px 0px 5px',
-        overflowY: 'auto'
+        overflowY: 'auto',
+        paddingBottom:'7px'
        }
 
        if(this.layoutType==='grid'){
@@ -454,7 +463,7 @@ export default {
             display: 'grid',
             gridTemplateRows: `repeat(${maxRow}, auto)`,
             gridTemplateColumns: `repeat(${maxCol}, 1fr)`,
-            gap: '10px'
+            columnGrap: this.flexGap + 'px'
           }
        }
        //默认布局
@@ -479,6 +488,7 @@ export default {
   filters: {},
   data() {
     return {
+      flexGap:10,
       hiddenDetail: false,
       moment,
       editFormName: '',
@@ -591,19 +601,25 @@ export default {
   activated() {},
   methods: {
     getFieldStyle(colInfo){
+      // console.debug('0 0 calc('+colInfo.colSpan*250+'px -'+(colInfo.colSpan-1)*this.flexGap +'px)')
       let fieldStyle ={
-        width: colInfo.colSpan ? ('calc('+colInfo.colSpan*250+'px + '+(colInfo.colSpan-1)*16+'px)'): '250px',
-        flex: (colInfo.colSpan  ? colInfo.colSpan+' 1 auto' : null),
-        flexGrow: '1',
-        flexShrink: '1',
-        flexBasis: 'auto',
+        // width: colInfo.colSpan ? ('calc('+colInfo.colSpan*250+'px + '+(colInfo.colSpan-1)*16+'px)'): '250px',
+        flex: '0 0 ' + (colInfo.width && colInfo.width>200?colInfo.width:250)+'px',   //colInfo.colSpan ? '0 0 '+(colInfo.colSpan*250+(colInfo.colSpan-1)*this.flexGap)+'px': '0 0 250px',
+
+        // flexGrow: 0,
+        // flexShrink: 0,
+        // flexBasis: colInfo.colSpan? (colInfo.colSpan*250)+'px':'250px',
+        // flexGrow: '1',
+        // flexShrink: '1',
+        // flexBasis:'250px', //colInfo.colSpan ? ('calc('+colInfo.colSpan*250+'px + '+(colInfo.colSpan-1)*16+'px)'): '250px',
         marginTop: '0px',
-        marginRight: '8px',
+        // marginRight: '8px',
         marginBottom: '0px',
-        marginLeft: '8px',
-        padding: '2px 8px 2px 8px',
-        minWidth: '150px',
-        borderRadius: '6px'
+        // marginLeft: '8px',
+        // padding: '2px 8px 2px 8px',
+        // minWidth: '250px',
+        borderRadius: '6px',
+        maxWidth:'100%'
     }
       if(this.layoutType==='grid'){
         fieldStyle = {