unify-external-plugin-platform 0.0.3-76 → 0.0.3-78

package/dist/external-plugin.common.js

@@ -89752,8 +89752,8 @@ id_card_reader_button.install = Vue => {
   Vue.component(id_card_reader_button.name, id_card_reader_button);
 };
 /* harmony default export */ var id_card_reader_id_card_reader_button = (id_card_reader_button);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/scanner/scanner-nko/src/scanner-nko.vue?vue&type=template&id=f121193e&
-var scanner_nkovue_type_template_id_f121193e_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/scanner/scanner-nko/src/scanner-nko.vue?vue&type=template&id=62af0999&
+var scanner_nkovue_type_template_id_62af0999_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-container', {
@@ -90083,7 +90083,7 @@ var scanner_nkovue_type_template_id_f121193e_render = function render() {
     }
   }, [_vm._v("上传")])], 1)])], 1)], 1);
 };
-var scanner_nkovue_type_template_id_f121193e_staticRenderFns = [];
+var scanner_nkovue_type_template_id_62af0999_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/web.dom-exception.stack.js
 var web_dom_exception_stack = __webpack_require__(2801);
@@ -90478,9 +90478,36 @@ _defineProperty(NkoService, "fileList", []);
     }
   },
   created() {
-    this.scanConfig.fileTransferMode = this.fileTransferMode;
+    // 优先使用 prop 传入的传输模式，否则从缓存恢复
+    const cachedConfig = this.getCachedConfig();
+    if (this.fileTransferMode) {
+      this.scanConfig.fileTransferMode = this.fileTransferMode;
+    } else if (cachedConfig?.fileTransferMode) {
+      this.scanConfig.fileTransferMode = cachedConfig.fileTransferMode;
+    }
   },
   methods: {
+    /** localStorage 缓存 key */
+    _cacheKey() {
+      return 'scanner-nko-config';
+    },
+    /** 读取缓存的扫描配置 */
+    getCachedConfig() {
+      try {
+        const raw = localStorage.getItem(this._cacheKey());
+        return raw ? JSON.parse(raw) : null;
+      } catch (e) {
+        return null;
+      }
+    },
+    /** 将当前扫描配置写入缓存 */
+    saveConfigToCache() {
+      try {
+        localStorage.setItem(this._cacheKey(), JSON.stringify(this.scanConfig));
+      } catch (e) {
+        // ignore
+      }
+    },
     handleCheckAllChange(val) {
       this.scanFileList.forEach(data => {
         data.checked = val;
@@ -90502,6 +90529,14 @@ _defineProperty(NkoService, "fileList", []);
       this.deviceList = await NkoService.getDeivceList();
       this.deviceOpend = true;
       this.pageLoading = false;
+
+      // 连接成功后，恢复缓存的扫描源（deviceId）
+      const cached = this.getCachedConfig();
+      if (cached?.deviceId && this.deviceList.some(d => d.deviceId === cached.deviceId)) {
+        this.scanConfig.deviceId = cached.deviceId;
+        // 自动触发获取该设备的能力选项
+        this.openDeivce();
+      }
     },
     /**
      * 扫描服务关闭时回调
@@ -90555,11 +90590,19 @@ _defineProperty(NkoService, "fileList", []);
       this.resolutionOptions = options.resolution;
       this.paperSizeOptions = options['paper-size'];
       this.fileFormatOptions = options['image-format'];
-      this.scanConfig.source = this.sourceOptions[0] || null;
-      this.scanConfig.mode = this.modeOptions[0] || null;
-      this.scanConfig.resolution = this.resolutionOptions[0] || null;
-      this.scanConfig.paperSize = this.paperSizeOptions[0] || null;
-      this.scanConfig.fileFormat = this.fileFormatOptions[0] || null;
+
+      // 恢复缓存配置：若缓存值在当前设备能力列表中则使用缓存值，否则取第一项
+      const cached = this.getCachedConfig();
+      const isValid = (list, val) => val && list.includes(val);
+      this.scanConfig.source = isValid(this.sourceOptions, cached?.source) ? cached.source : this.sourceOptions[0] || null;
+      this.scanConfig.mode = isValid(this.modeOptions, cached?.mode) ? cached.mode : this.modeOptions[0] || null;
+      this.scanConfig.resolution = isValid(this.resolutionOptions, cached?.resolution) ? cached.resolution : this.resolutionOptions[0] || null;
+      this.scanConfig.paperSize = isValid(this.paperSizeOptions, cached?.paperSize) ? cached.paperSize : this.paperSizeOptions[0] || null;
+      this.scanConfig.fileFormat = isValid(this.fileFormatOptions, cached?.fileFormat) ? cached.fileFormat : this.fileFormatOptions[0] || null;
+      // fileTransferMode 不依赖设备，直接恢复
+      if (cached?.fileTransferMode) {
+        this.scanConfig.fileTransferMode = cached.fileTransferMode;
+      }
       this.deviceOpend = true;
       this.pageLoading = false;
     },
@@ -90580,6 +90623,8 @@ _defineProperty(NkoService, "fileList", []);
       });
       const data = await NkoService.scan(this.scanConfig.fileFormat, this.fileSavePath, this.fileNamePrefix, this.fileNameFormat, this.scanConfig.fileTransferMode);
       this.scanFileList = [...this.scanFileList, ...data];
+      // 扫描成功后缓存当前配置，下次使用时直接恢复
+      this.saveConfigToCache();
       this.pageLoading = false;
     },
     //预览
@@ -90611,10 +90656,10 @@ _defineProperty(NkoService, "fileList", []);
 });
 ;// CONCATENATED MODULE: ./packages/scanner/scanner-nko/src/scanner-nko.vue?vue&type=script&lang=js&
  /* harmony default export */ var src_scanner_nkovue_type_script_lang_js_ = (scanner_nkovue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/scanner/scanner-nko/src/scanner-nko.vue?vue&type=style&index=0&id=f121193e&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/scanner/scanner-nko/src/scanner-nko.vue?vue&type=style&index=0&id=62af0999&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./packages/scanner/scanner-nko/src/scanner-nko.vue?vue&type=style&index=0&id=f121193e&prod&lang=scss&
+;// CONCATENATED MODULE: ./packages/scanner/scanner-nko/src/scanner-nko.vue?vue&type=style&index=0&id=62af0999&prod&lang=scss&
 
 ;// CONCATENATED MODULE: ./packages/scanner/scanner-nko/src/scanner-nko.vue
 
@@ -90627,8 +90672,8 @@ _defineProperty(NkoService, "fileList", []);
 
 var scanner_nko_component = normalizeComponent(
   src_scanner_nkovue_type_script_lang_js_,
-  scanner_nkovue_type_template_id_f121193e_render,
-  scanner_nkovue_type_template_id_f121193e_staticRenderFns,
+  scanner_nkovue_type_template_id_62af0999_render,
+  scanner_nkovue_type_template_id_62af0999_staticRenderFns,
   false,
   null,
   null,

package/dist/external-plugin.umd.js

@@ -89762,8 +89762,8 @@ id_card_reader_button.install = Vue => {
   Vue.component(id_card_reader_button.name, id_card_reader_button);
 };
 /* harmony default export */ var id_card_reader_id_card_reader_button = (id_card_reader_button);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-85.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/scanner/scanner-nko/src/scanner-nko.vue?vue&type=template&id=f121193e&
-var scanner_nkovue_type_template_id_f121193e_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-85.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/scanner/scanner-nko/src/scanner-nko.vue?vue&type=template&id=62af0999&
+var scanner_nkovue_type_template_id_62af0999_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-container', {
@@ -90093,7 +90093,7 @@ var scanner_nkovue_type_template_id_f121193e_render = function render() {
     }
   }, [_vm._v("上传")])], 1)])], 1)], 1);
 };
-var scanner_nkovue_type_template_id_f121193e_staticRenderFns = [];
+var scanner_nkovue_type_template_id_62af0999_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/web.dom-exception.stack.js
 var web_dom_exception_stack = __webpack_require__(2801);
@@ -90488,9 +90488,36 @@ _defineProperty(NkoService, "fileList", []);
     }
   },
   created() {
-    this.scanConfig.fileTransferMode = this.fileTransferMode;
+    // 优先使用 prop 传入的传输模式，否则从缓存恢复
+    const cachedConfig = this.getCachedConfig();
+    if (this.fileTransferMode) {
+      this.scanConfig.fileTransferMode = this.fileTransferMode;
+    } else if (cachedConfig?.fileTransferMode) {
+      this.scanConfig.fileTransferMode = cachedConfig.fileTransferMode;
+    }
   },
   methods: {
+    /** localStorage 缓存 key */
+    _cacheKey() {
+      return 'scanner-nko-config';
+    },
+    /** 读取缓存的扫描配置 */
+    getCachedConfig() {
+      try {
+        const raw = localStorage.getItem(this._cacheKey());
+        return raw ? JSON.parse(raw) : null;
+      } catch (e) {
+        return null;
+      }
+    },
+    /** 将当前扫描配置写入缓存 */
+    saveConfigToCache() {
+      try {
+        localStorage.setItem(this._cacheKey(), JSON.stringify(this.scanConfig));
+      } catch (e) {
+        // ignore
+      }
+    },
     handleCheckAllChange(val) {
       this.scanFileList.forEach(data => {
         data.checked = val;
@@ -90512,6 +90539,14 @@ _defineProperty(NkoService, "fileList", []);
       this.deviceList = await NkoService.getDeivceList();
       this.deviceOpend = true;
       this.pageLoading = false;
+
+      // 连接成功后，恢复缓存的扫描源（deviceId）
+      const cached = this.getCachedConfig();
+      if (cached?.deviceId && this.deviceList.some(d => d.deviceId === cached.deviceId)) {
+        this.scanConfig.deviceId = cached.deviceId;
+        // 自动触发获取该设备的能力选项
+        this.openDeivce();
+      }
     },
     /**
      * 扫描服务关闭时回调
@@ -90565,11 +90600,19 @@ _defineProperty(NkoService, "fileList", []);
       this.resolutionOptions = options.resolution;
       this.paperSizeOptions = options['paper-size'];
       this.fileFormatOptions = options['image-format'];
-      this.scanConfig.source = this.sourceOptions[0] || null;
-      this.scanConfig.mode = this.modeOptions[0] || null;
-      this.scanConfig.resolution = this.resolutionOptions[0] || null;
-      this.scanConfig.paperSize = this.paperSizeOptions[0] || null;
-      this.scanConfig.fileFormat = this.fileFormatOptions[0] || null;
+
+      // 恢复缓存配置：若缓存值在当前设备能力列表中则使用缓存值，否则取第一项
+      const cached = this.getCachedConfig();
+      const isValid = (list, val) => val && list.includes(val);
+      this.scanConfig.source = isValid(this.sourceOptions, cached?.source) ? cached.source : this.sourceOptions[0] || null;
+      this.scanConfig.mode = isValid(this.modeOptions, cached?.mode) ? cached.mode : this.modeOptions[0] || null;
+      this.scanConfig.resolution = isValid(this.resolutionOptions, cached?.resolution) ? cached.resolution : this.resolutionOptions[0] || null;
+      this.scanConfig.paperSize = isValid(this.paperSizeOptions, cached?.paperSize) ? cached.paperSize : this.paperSizeOptions[0] || null;
+      this.scanConfig.fileFormat = isValid(this.fileFormatOptions, cached?.fileFormat) ? cached.fileFormat : this.fileFormatOptions[0] || null;
+      // fileTransferMode 不依赖设备，直接恢复
+      if (cached?.fileTransferMode) {
+        this.scanConfig.fileTransferMode = cached.fileTransferMode;
+      }
       this.deviceOpend = true;
       this.pageLoading = false;
     },
@@ -90590,6 +90633,8 @@ _defineProperty(NkoService, "fileList", []);
       });
       const data = await NkoService.scan(this.scanConfig.fileFormat, this.fileSavePath, this.fileNamePrefix, this.fileNameFormat, this.scanConfig.fileTransferMode);
       this.scanFileList = [...this.scanFileList, ...data];
+      // 扫描成功后缓存当前配置，下次使用时直接恢复
+      this.saveConfigToCache();
       this.pageLoading = false;
     },
     //预览
@@ -90621,10 +90666,10 @@ _defineProperty(NkoService, "fileList", []);
 });
 ;// CONCATENATED MODULE: ./packages/scanner/scanner-nko/src/scanner-nko.vue?vue&type=script&lang=js&
  /* harmony default export */ var src_scanner_nkovue_type_script_lang_js_ = (scanner_nkovue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-67.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-67.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-67.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-67.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/scanner/scanner-nko/src/scanner-nko.vue?vue&type=style&index=0&id=f121193e&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-67.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-67.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-67.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-67.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/scanner/scanner-nko/src/scanner-nko.vue?vue&type=style&index=0&id=62af0999&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./packages/scanner/scanner-nko/src/scanner-nko.vue?vue&type=style&index=0&id=f121193e&prod&lang=scss&
+;// CONCATENATED MODULE: ./packages/scanner/scanner-nko/src/scanner-nko.vue?vue&type=style&index=0&id=62af0999&prod&lang=scss&
 
 ;// CONCATENATED MODULE: ./packages/scanner/scanner-nko/src/scanner-nko.vue
 
@@ -90637,8 +90682,8 @@ _defineProperty(NkoService, "fileList", []);
 
 var scanner_nko_component = normalizeComponent(
   src_scanner_nkovue_type_script_lang_js_,
-  scanner_nkovue_type_template_id_f121193e_render,
-  scanner_nkovue_type_template_id_f121193e_staticRenderFns,
+  scanner_nkovue_type_template_id_62af0999_render,
+  scanner_nkovue_type_template_id_62af0999_staticRenderFns,
   false,
   null,
   null,