Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-20 2ab9e3e914b6c29a3ab34d7b73113e751e113f0f

 src/components/makepager/CommonFormTableView.vue

@@ -148,7 +148,9 @@
              <!-- 位置 -->
              <el-form-item v-else-if="item.location" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
                <div class="custom-name">
                  <span v-if="scope.row.isEdit || scope.row.editable">{{ scope.row[item.prop].label }}</span>
                  <span v-if="scope.row.isEdit || scope.row.editable">{{
                    scope.row[item.prop]?.label ?? scope.row[item.prop]
                  }}</span>
                  <el-select
                    v-else
                    v-model="scope.row[item.prop]"