fix: 修复等效焦距不存在时，参数显示异常

fix: 修复上传字体后，字体选择异常

electron/main/app.ts

@@ -142,7 +142,7 @@ export default class Application {
 
   private async createDefWin() {
     const opts: BrowserWindowConstructorOptions = {
-      width: 700 + (isDev ? 500 : 0),
+      width: 800 + (isDev ? 500 : 0),
       height: 610,
       title: '壹印',
       frame: false,

electron/src/modules/exiftool/index.ts

@@ -87,10 +87,10 @@ export class ExifTool {
       Model: record.CameraModelName || '',
       LensMake: record.LensMake || '',
       LensModel: record.LensModel || '',
-      FNumber: record.FNumber || '',
+      FNumber: record.FNumber.split('.')[0] || '',
       ISO: record.ISO || '',
       FocalLength: record.FocalLength?.split('.')[0] || '',
-      FocalLengthIn35mmFormat: record.FocalLengthIn35mmFormat?.split(' ')[0] || '',
+      FocalLengthIn35mmFormat: record.FocalLengthIn35mmFormat?.split(' ')[0] || record.FocalLength?.split('.')[0] || '',
       ExposureTime: record.ExposureTime || '',
       DateTimeOriginal: record.DateTimeOriginal || '',
       ExposureCompensation: record.ExposureCompensation || '',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yiyin",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "license": "MIT",
   "type": "module",
   "main": "dist-electron/main/index.js",

web/components/font-select/index.scss

@@ -36,6 +36,7 @@
 }
 
 .db-select-dropdown {
+  width: 180px !important;
   background-color: var(--bg-color);
 
   .db-select-dropdown__item {

web/components/font-select/index.svelte

@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { arrToObj } from '@common/utils';
   import { FontDialog } from '@components';
   import { Message, Option, Select } from '@ggchivalrous/db-ui';
   import frederickathegreat from '@web/assets/font/FrederickatheGreat.ttf';
@@ -13,6 +14,7 @@
   export let value = '';
   export let clearable = false;
 
+  const dispatch = createEventDispatcher();
   const defActiveFont = { name: 'PingFang SC', fileName: '' };
   const defFont = [
     defActiveFont,
@@ -21,7 +23,7 @@
     { name: 'FrederickatheGreat', fileName: frederickathegreat },
     { name: 'Neoneon', fileName: neoneon },
   ];
-  const dispatch = createEventDispatcher();
+  const defFontRecord = arrToObj(defFont, 'name');
   let fontList = [...defFont];
   let visible = false;
 
@@ -63,7 +65,9 @@
       }
 
       fontList = [...defFont, ...list];
-      if ((!_fontMap[value] && value !== defActiveFont.name) || !value) {
+
+      // 选择的字体已经被删除了，则改为默认字体
+      if ((!_fontMap[value] && !defFontRecord[value]) || !value) {
         value = defActiveFont.name;
       }
     }

web/modules/text-tool/index.ts

@@ -55,9 +55,7 @@ export class TextTool {
 
           if (fieldTemp.type === 'text') {
             slotInfo.value = `${fieldTemp.value}`.trim();
-            if (slotInfo.value) {
-              slotInfoList.push(slotInfo);
-            }
+            slotInfoList.push(slotInfo.value ? slotInfo : '');
             continue;
           }
 
@@ -70,23 +68,21 @@ export class TextTool {
             slotInfo.value = await loadImage(fieldTemp.wImg);
           }
 
-          if (slotInfo.value) {
-            slotInfoList.push(slotInfo);
-          }
+          slotInfoList.push(slotInfo.value ? slotInfo : '');
         }
 
         const _arr = text.trim().split('{---}');
 
         if (
           (_arr.length === 1 && !_arr[0].trim())
-          || (_arr.length > 1 && !slotInfoList.length)
+          || (_arr.length > 1 && !slotInfoList.filter(Boolean).length)
         ) continue;
 
         for (let j = 0; j < _arr.length; j++) {
-          if (slotInfoList[j]?.value) {
-            textList.push(_arr[j], slotInfoList[j]);
-          } else {
+          if (typeof slotInfoList[j] === 'string' || !(slotInfoList[j] as any)?.value) {
             textList.push(_arr[j]);
+          } else {
+            textList.push(_arr[j], slotInfoList[j]);
           }
         }
       } else {