Jelajahi Sumber

4.0.84 修复按钮组中,按钮不显示的BUG。

YangZhiJie 1 tahun lalu
induk
melakukan
a4f8747571
1 mengubah file dengan 17 tambahan dan 12 penghapusan
  1. 17 12
      src/window1/tabGridView/CellTextItem.vue

+ 17 - 12
src/window1/tabGridView/CellTextItem.vue

@@ -10,7 +10,9 @@
         && !fieldUtil.isEnumListType(gridFieldItem)
         && !fieldUtil.isTextAreaType(gridFieldItem)
         && !fieldUtil.isRichTextAreaEditor(gridFieldItem)
-        && !fieldUtil.isCustomerRender(gridFieldItem)"
+        && !fieldUtil.isCustomerRender(gridFieldItem)
+        && !fieldUtil.isButtonType(gridFieldItem)
+        && !fieldUtil.isGridButtonEditor(gridFieldItem)"
     >
       {{ displayValue(modelData) }}
     </div>
@@ -69,14 +71,6 @@
       <FileListWidget :field="gridFieldItem" :field-value="fieldValue" :class-name="className" :readonly="true" />
     </div>
 
-
-    <component
-      :is="customerComponentName" v-else-if="fieldUtil.isCustomerRender(gridFieldItem)" :field="gridFieldItem"
-      :field-value="fieldValue" :class-name="className"
-      :model-data="modelData"
-      @refresh-data="refreshDatas"
-    />
-
     <div v-else-if="fieldUtil.isGridButtonEditor(gridFieldItem)">
       <template v-for="(tabGridButtonItem, index) in gridFieldItem.tabGridButtonDtos" :key="tabGridButtonItem.name">
         <template v-if="visible[index]">
@@ -125,7 +119,17 @@
         </template>
       </template>
     </div>
+
+    <component
+      :is="customerComponentName" v-else-if="fieldUtil.isCustomerRender(gridFieldItem)" :field="gridFieldItem"
+      :field-value="fieldValue" :class-name="className"
+      :model-data="modelData"
+      @refresh-data="refreshDatas"
+    />
   </div>
+
+  
+
   <Modal v-model:show="modal" :full="true">
     <ProcessReportResultPreview
       v-if="
@@ -311,7 +315,7 @@ export default {
       immediate: true,
       handler(curVal, oldVal) {
         console.log('cellTextItem监听');
-        // this.cellTextItemTabGridButtonShowLogical();
+        this.cellTextItemTabGridButtonShowLogical();
       },
     },
 
@@ -337,7 +341,7 @@ export default {
     },
   },
   mounted: function () {
-    this.cellTextItemTabGridButtonShowLogical();
+    // this.cellTextItemTabGridButtonShowLogical();
   },
   methods: {
     /**
@@ -365,6 +369,7 @@ export default {
               let ctx = new _self.getContext(_self.modelData);
               try {
                 _self.visible[index] = _self[functionName](ctx);
+                console.log(tabGridButtonItem.name, index, _self.visible[index]);
               } catch (e) {
                 console.error('js代码 %s 执行异常 %o', showLogical, e);
                 _self.visible[index] = true;
@@ -795,13 +800,13 @@ export default {
             });
           }
           _self.titleModal = false;
+          _self.refreshDatas();
         },
         errorData => {
           _self.titleModal = false;
           Common.processException(errorData);
         },
       );
-      _self.refreshDatas();
     // }
     },
     //关闭表头按钮提示框