doway-coms 2.10.72 → 2.10.73

package/package.json

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

package/packages/BaseForm/src/index.vue

@@ -10,7 +10,7 @@
     </a-button>
     <div
       :style="getFieldStyle(col)"
-      v-for="(col,colIndex) in internalComputedHiddenCols"
+      v-for="(col) in internalComputedHiddenCols"
       :key="col.field"
       v-show="hiddenDetail ? col.foldVisible===true : true"
     >
@@ -37,7 +37,11 @@
             blurChange(col)
           }
         "
-      />
+      >
+      <template #right="slotProps">
+        <slot :name="'right-' + col.field" v-bind="slotProps"></slot>
+      </template>
+    </BaseInput>
       <!-- 按钮弹出框输入控件 -->
       <!-- isButtonShow字段是额外添加字段，用于控制区分输入框控件 -->
       <BaseButton
@@ -326,6 +330,7 @@
           }
         "
       />
+       <!-- 在最后添加自定义插槽 -->
     </div>
     <template v-if="layoutType==='default'">
     <!-- <div  class="d-form-item-ghost"></div>

package/packages/BaseGrid/src/index.vue

@@ -3164,7 +3164,7 @@ export default {
     },
     headerCellStyleFunc(scope){
         let customStyle = {}
-        if(this.$store.getters.baseSetting?.gridHeaderCellStyle){
+        if(this.$store.getters.baseSetting && this.$store.getters.baseSetting.gridHeaderCellStyle){
           customStyle = JSON.parse(this.$store.getters.baseSetting.gridHeaderCellStyle)
         }
         // console.debug('customStyle',customStyle)
@@ -3173,7 +3173,7 @@ export default {
               customStyle[loopProp] = this.headerCellStyle[loopProp]
             }
         }
-        if(scope.column?.params.headerCellStyle){
+        if(scope.column.params && scope.column.params.headerCellStyle){
             for(let loopProp in scope.column.params.headerCellStyle){
               customStyle[loopProp] = scope.column.params.headerCellStyle[loopProp]
             }
@@ -3194,7 +3194,7 @@ export default {
         if(this.cellStyle){
             customStyle = this.cellStyle
         }
-        if(scope.column?.params.cellStyle){
+        if( scope.column.params && scope.column.params.cellStyle){
             for(let loopProp in scope.column.params.cellStyle){
               customStyle[loopProp] = scope.column.params.cellStyle[loopProp]
             }

package/packages/BaseInput/src/index.vue

@@ -44,6 +44,7 @@
         </span>
       </Tooltip>
     </div>
+    <slot name="right" :field="name"></slot>
   </div>
 </template>