Ver código fonte

优化卡片模板bug

hml 5 meses atrás
pai
commit
ea50c31fdc

+ 1 - 2
src/components/CardTemplate/index.vue

@@ -337,7 +337,6 @@ export default {
     }
   },
   async created() {
-
     // console.log(this.columnList)
     await this.columnList.forEach(async (item) => {
       if (item.propsUrl && item.propsUrl.length) {
@@ -410,7 +409,7 @@ export default {
       } else {
         if (this.cardInfo.imgModel && this.cardInfo.imgModel != '') {
           let imgFiledId = this.columnList.find((val) => val.propId == this.cardInfo.imgModel)?.field
-          if (imgFiledId && data[imgFiledId] != '' && data[imgFiledId].length) {
+          if (imgFiledId && data[imgFiledId] != '' && data[imgFiledId] != null && data[imgFiledId] != undefined) {
             let url = data[imgFiledId].split(',')[0]
             return comUrl + '/api/file/getFileInputStreamById/' + url
           }

+ 10 - 2
src/components/ColumnDesign/index.vue

@@ -357,7 +357,15 @@
                         <el-input-number v-model="columnData.cardTypeStyle.info.size" :min="0" :max="99"></el-input-number>
                       </el-form-item>
                       <el-form-item label="栅格布局">
-                        <el-slider v-model="columnData.cardTypeStyle.info.col" :max="24" :min="2" show-stops :step="2" show-tooltip />
+                        <el-radio-group v-model="columnData.cardTypeStyle.info.col">
+                          <el-radio-button label="24">1</el-radio-button>
+                          <el-radio-button label="12">2</el-radio-button>
+                          <el-radio-button label="8">3</el-radio-button>
+                          <el-radio-button label="6">4</el-radio-button>
+                          <el-radio-button label="4.8">5</el-radio-button>
+                          <el-radio-button label="4">6</el-radio-button>
+                        </el-radio-group>
+                        <!-- <el-slider v-model="columnData.cardTypeStyle.info.col" :max="24" :min="2" show-stops :step="2" show-tooltip /> -->
                       </el-form-item>
                       <div v-for="(item, index) in columnData.cardTypeStyle.info.data" :key="index">
                         <div>详情{{ index + 1 }} <el-button type="text" style="color: #f56c6c" size="small" icon="el-icon-delete" @click="deleteInfo(index)"></el-button></div>
@@ -602,7 +610,7 @@ const defaultColumnData = {
     rowNum: 3, // 每行显示个数
     gap: 10,
     bgColor: '#fff', // 背景颜色
-    shadowColor: 'rgba(0,0,0,1)', // 阴影颜色
+    shadowColor: 'rgba(0,0,0,0.1)', // 阴影颜色
     borderColor: '#ebeef5',
     shadowPx: 10,
     title: {