Jelajahi Sumber

fix: 更新版本

wanggaokun 1 tahun lalu
induk
melakukan
382587228d

+ 1 - 1
src/assets/fonts/font.scss

@@ -10,5 +10,5 @@
 
 @font-face {
   font-family: DIN;
-  src: url('./DIN.Otf');
+  src: url('./DIN.otf');
 }

+ 2 - 2
src/components/ProTable/components/TableColumn.vue

@@ -33,13 +33,13 @@ const RenderTableColumn = (item: ColumnProps) => {
             default: (scope: RenderScope<any>) => {
               if (item._children) return item._children.map(child => RenderTableColumn(child))
               if (item.render) return item.render(scope)
-              if (slots[handleProp(item.prop!)]) return slots[handleProp(item.prop!)]!(scope)
+              if (item.prop && slots[handleProp(item.prop)]) return slots[handleProp(item.prop)]!(scope)
               if (item.tag) return <el-tag type={getTagType(item, scope)}>{renderCellData(item, scope)}</el-tag>
               return renderCellData(item, scope)
             },
             header: (scope: HeaderRenderScope<any>) => {
               if (item.headerRender) return item.headerRender(scope)
-              if (slots[`${handleProp(item.prop!)}Header`]) return slots[`${handleProp(item.prop!)}Header`]!(scope)
+              if (item.prop && slots[`${handleProp(item.prop)}Header`]) return slots[`${handleProp(item.prop)}Header`]!(scope)
               return item.label
             }
           }}

+ 1 - 1
src/components/ProTable/index.vue

@@ -46,7 +46,7 @@
           </template>
         </el-table-column>
         <!-- other -->
-        <TableColumn v-if="!item.type && item.prop && item.isShow" :column="item">
+        <TableColumn v-else :column="item">
           <template v-for="slot in Object.keys($slots)" #[slot]="scope">
             <slot :name="slot" v-bind="scope" />
           </template>

+ 4 - 0
src/views/login/components/LoginForm.vue

@@ -165,6 +165,10 @@ onMounted(() => {
     }
   }
 })
+
+onBeforeUnmount(() => {
+  document.onkeydown = null
+})
 </script>
 
 <style scoped lang="scss">