Bladeren bron

修复非空判断的问题

xiaochan 2 jaren geleden
bovenliggende
commit
e8608a9ba4
2 gewijzigde bestanden met toevoegingen van 17 en 13 verwijderingen
  1. 15 11
      src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/table/YzTableV2.vue
  2. 2 2
      src/utils/public.ts

+ 15 - 11
src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/table/YzTableV2.vue

@@ -1,15 +1,19 @@
 <template>
-  <xc-table-v2 :data="tempYzData"
-               @rowClick="rowClick"
-               :width="yzSize.w"
-               row-key="actOrderNo"
-               @contextmenu="contextmenuItem"
-               :height="yzSize.h - height - 35"
-               @dbRowClick="setDefaultStopTime"
-               ref="tableRef"
-               @blank-right-click="blankRightClick"
-               :row-class="rowClass"
-               :columns="header"/>
+  <div style="display: flex; ">
+    <div style="width: 8px;"/>
+    <xc-table-v2 :data="tempYzData"
+                 @rowClick="rowClick"
+                 :width="yzSize.w - 8"
+                 row-key="actOrderNo"
+                 @contextmenu="contextmenuItem"
+                 :height="yzSize.h - height - 35"
+                 @dbRowClick="setDefaultStopTime"
+                 ref="tableRef"
+                 @blank-right-click="blankRightClick"
+                 :row-class="rowClass"
+                 :columns="header"/>
+  </div>
+
   <right-click-menu :mouse-position="mousePosition" :config="opt"/>
 </template>
 

+ 2 - 2
src/utils/public.ts

@@ -24,8 +24,8 @@ export function noNeedRule(...val) {
 // @ts-ignore
 export let isDev = import.meta.env.MODE === "development"
 
-export const nullToEmpty = (val) => {
-    if (XEUtils.isEmpty(val)) {
+export const nullToEmpty = (val: string): string => {
+    if (typeof val === 'undefined' || val === null) {
         return ''
     } else {
         return val