doway-coms 2.10.50 → 2.10.52

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -173,7 +173,7 @@
         <div class="interceptor-class">
           <a-input
             :style="{color:scope.column.params.fontColor?scope.column.params.fontColor:null}"
-              v-if="scope.column.params.controlEdit === true"
+             v-if="getCellEditExp(scope)"
             class="inner-cell-control"
             size="small"
             v-model="scope.row[scope.column.property]"
@@ -200,7 +200,7 @@
       <template #number_edit="scope">
         <div class="interceptor-class">
           <a-input-number
-              v-if="scope.column.params.controlEdit === true"
+              v-if="getCellEditExp(scope)"
             class="inner-cell-control"
             :style="{color:scope.column.params.fontColor?scope.column.params.fontColor:null}"
             size="small"
@@ -302,10 +302,11 @@
       <template #pulldown_edit="scope" class="interceptor-class">
         <div class="interceptor-class">
           <BasePulldown
+            v-if="getCellEditExp(scope)"
             v-model="scope.row[scope.column.property]"
             :field="scope.column.property"
             :formRow="formRow"
-            :edit="scope.column.params.controlEdit === true"
+            :edit="true"
             :showLabel="false"
             :row="scope.row"
             :api="scope.column.params.api"
@@ -331,6 +332,9 @@
             :propTableData="getTableData()"
             :disabled="editDisabled(scope)"
           />
+          <div v-else>
+            {{ gridDefaultValueDisplay(scope.row, scope.column) }}
+          </div>
         </div>
       </template>
       <template #treeSelect_edit="scope">
@@ -339,7 +343,8 @@
             v-model="scope.row[scope.column.property]"
             :field="scope.column.property"
             :formRow="formRow"
-            :edit="scope.column.params.controlEdit === true"
+              v-if="getCellEditExp(scope)"
+            :edit="true"
             :showLabel="false"
             :row="scope.row"
             class="inner-cell-control"
@@ -355,6 +360,9 @@
             @preSearch="(searchInfo) => preSearch(searchInfo, scope)"
           >
           </BaseTreeSelect>
+          <div v-else>
+            {{ gridDefaultValueDisplay(scope.row, scope.column) }}
+          </div>
         </div>
       </template>