unify-external-plugin-platform 0.0.2-53 → 0.0.2-57

package/dist/external-plugin.common.js

@@ -84345,7 +84345,7 @@ class IdCardCommonUtils {
    * 是否为外国人永久居留证
    */
   static isForeignersIdCard(idNumber) {
-    let regexp = /[a-zA-Z]/; // 定义正则表达式，匹配任意大小写的英文字母
+    let regexp = /^[a-zA-Z]{3}[0-9]{12}$/; // 定义正则表达式，匹配任意大小写的英文字母
     return regexp.test(idNumber) || idNumber.startsWith('9');
   }
 }
@@ -84623,9 +84623,10 @@ class JieYueService {
     if (readData.result !== 1) {
       throw Error("读取二代身份证失败，返回值：" + readData.ret + "，错误信息：" + readData.errMsg);
     }
-    // Agency 发证机关，外国人永居证时，该值为中文名
+    console.log(readData);
     let {
       Name: name,
+      EnglishName: englishName,
       Sex: sex,
       BirthDate: birthday,
       Address: address,
@@ -84637,21 +84638,18 @@ class JieYueService {
     } = readData;
     let [validStart, validEnd] = Valid.split('-');
     let chineseName = '',
-      englishName = '',
       cardType = '1',
       nationality = '中国';
     // 外国人永居证
     let foreignersIDCard = IdCardCommonUtils.isForeignersIdCard(idNumber);
     if (foreignersIDCard) {
-      idNumber = idNumber.startsWith('9') ? idNumber : idNumber.substring(0, idNumber.length - 3);
-      englishName = name; // 英文名
-      chineseName = police || '无中文姓名'; // 中文名，没有时为 无中文姓名
-      name = police || name; // 姓名，先读中文名，没有时读英文名 捷宇高拍仪读卡  外国人永居证时  发证机关（Agency），该值为中文名
-      police = '中华人民共和国国家移民管理局'; // 发证机关，读不到，默认
       cardType = '9'; // 永居证
-      nationality = ''; // 读不到，暂时为空
+      chineseName = name;
+      name = name === '无中文姓名' ? englishName : name; // 姓名，先读中文名，没有时读英文名
+      police = '中华人民共和国国家移民管理局'; // 发证机关，读不到，默认
+      nationality = nation; // 永居证国籍放在名族里面的
+      nation = '';
     }
-
     const IDCardData = {
       info: {
         cardType,
@@ -85366,8 +85364,8 @@ id_card_reader_eloam.install = Vue => {
   Vue.component(id_card_reader_eloam.name, id_card_reader_eloam);
 };
 /* harmony default export */ var id_card_reader_id_card_reader_eloam = (id_card_reader_eloam);
-;// 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/id-card-reader/id-card-reader-button/src/id-card-reader-button.vue?vue&type=template&id=019a341e&scoped=true&
-var id_card_reader_buttonvue_type_template_id_019a341e_scoped_true_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/id-card-reader/id-card-reader-button/src/id-card-reader-button.vue?vue&type=template&id=5ba8415b&scoped=true&
+var id_card_reader_buttonvue_type_template_id_5ba8415b_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _vm.tip ? _c('el-tooltip', {
@@ -85426,7 +85424,7 @@ var id_card_reader_buttonvue_type_template_id_019a341e_scoped_true_render = func
     return [_vm._v(_vm._s(_vm.label))];
   })], 2);
 };
-var id_card_reader_buttonvue_type_template_id_019a341e_scoped_true_staticRenderFns = [];
+var id_card_reader_buttonvue_type_template_id_5ba8415b_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./packages/service/external-plugins/default-plugin-socket.service.ts
 
@@ -87011,6 +87009,168 @@ class HuaShiService {
 _defineProperty(HuaShiService, "idCardWebSocketUrl", 'ws://127.0.0.1:7415');
 _defineProperty(HuaShiService, "ws", void 0);
 _defineProperty(HuaShiService, "requestStore", []);
+;// 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/id-card-reader/id-card-reader-button/src/dialog/default-take-photo-dialog.vue?vue&type=template&id=78e071da&scoped=true&
+var default_take_photo_dialogvue_type_template_id_78e071da_scoped_true_render = function render() {
+  var _vm = this,
+    _c = _vm._self._c;
+  return _c('el-dialog', {
+    staticClass: "face-auth-dialog",
+    attrs: {
+      "title": "拍照",
+      "top": '5vh',
+      "width": '620px',
+      "visible": _vm.visibility,
+      "close-on-click-modal": false
+    },
+    on: {
+      "update:visible": function ($event) {
+        _vm.visibility = $event;
+      }
+    }
+  }, [_c('div', {
+    staticClass: "image-container"
+  }, [_c('video', {
+    ref: "monitor",
+    staticClass: "videoContainer",
+    attrs: {
+      "autoplay": "",
+      "width": "250",
+      "height": "300"
+    }
+  }), _c('canvas', {
+    ref: "photo",
+    staticClass: "videoContainer photo",
+    attrs: {
+      "width": "250",
+      "height": "300"
+    }
+  })]), _c('span', {
+    staticClass: "dialog-footer",
+    attrs: {
+      "slot": "footer"
+    },
+    slot: "footer"
+  }, [_vm._l(_vm.buttonList, function (button) {
+    return [_c('el-button', _vm._b({
+      key: button.name,
+      on: {
+        "click": function ($event) {
+          return _vm.buttonClickEvent(button.name);
+        }
+      }
+    }, 'el-button', button, false), [_vm._v(_vm._s(button.label) + " ")])];
+  })], 2)]);
+};
+var default_take_photo_dialogvue_type_template_id_78e071da_scoped_true_staticRenderFns = [];
+
+;// 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/index.js??vue-loader-options!./packages/id-card-reader/id-card-reader-button/src/dialog/default-take-photo-dialog.vue?vue&type=script&lang=js&
+/* harmony default export */ var default_take_photo_dialogvue_type_script_lang_js_ = ({
+  name: "default-take-photo-dialog",
+  data: () => {
+    return {
+      visibility: true,
+      scannerPhotoSrc: '',
+      buttonList: [{
+        name: 'cancel',
+        label: '取消',
+        size: 'small'
+      }, {
+        name: 'take-photo',
+        label: '拍照',
+        type: 'primary',
+        size: 'small'
+      }, {
+        name: 'sure',
+        label: '确定',
+        type: 'primary',
+        size: 'small'
+      }]
+    };
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initDefaultCamera();
+    });
+  },
+  methods: {
+    initDefaultCamera() {
+      let video = this.$refs.monitor;
+      let canvas = this.$refs.photo;
+      console.log(video, canvas);
+      let videoObj = {
+        audio: false,
+        video: {
+          width: 250,
+          height: 300
+        }
+      };
+      if (navigator.mediaDevices.getUserMedia) {
+        navigator.mediaDevices.getUserMedia(videoObj).then(stream => {
+          video.srcObject = stream;
+          video.play();
+        }).catch(error => {
+          this.$message.error('没有可用的摄像头!');
+          console.log(error);
+        });
+      }
+    },
+    takePicture() {
+      let video = this.$refs.monitor;
+      let canvas = this.$refs.photo;
+      let context = canvas.getContext('2d');
+      context.drawImage(video, 0, 0, 250, 300, 0, 0, 250, 300);
+      let img = canvas.toDataURL('image/png');
+      canvas.src = img;
+      this.scannerPhotoSrc = img.replace('data:image/png;base64,', '');
+    },
+    async buttonClickEvent(name) {
+      switch (name) {
+        case 'cancel':
+          this.visibility = false;
+          this.$emit('close');
+          break;
+        case 'take-photo':
+          this.takePicture();
+          break;
+        case 'sure':
+          let data = {
+            faceimg: this.scannerPhotoSrc
+          };
+          this.$emit('close', data);
+          this.visibility = false;
+          break;
+      }
+    }
+  }
+});
+;// CONCATENATED MODULE: ./packages/id-card-reader/id-card-reader-button/src/dialog/default-take-photo-dialog.vue?vue&type=script&lang=js&
+ /* harmony default export */ var dialog_default_take_photo_dialogvue_type_script_lang_js_ = (default_take_photo_dialogvue_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/id-card-reader/id-card-reader-button/src/dialog/default-take-photo-dialog.vue?vue&type=style&index=0&id=78e071da&prod&scoped=true&lang=scss&
+// extracted by mini-css-extract-plugin
+
+;// CONCATENATED MODULE: ./packages/id-card-reader/id-card-reader-button/src/dialog/default-take-photo-dialog.vue?vue&type=style&index=0&id=78e071da&prod&scoped=true&lang=scss&
+
+;// CONCATENATED MODULE: ./packages/id-card-reader/id-card-reader-button/src/dialog/default-take-photo-dialog.vue
+
+
+
+;
+
+
+/* normalize component */
+
+var default_take_photo_dialog_component = normalizeComponent(
+  dialog_default_take_photo_dialogvue_type_script_lang_js_,
+  default_take_photo_dialogvue_type_template_id_78e071da_scoped_true_render,
+  default_take_photo_dialogvue_type_template_id_78e071da_scoped_true_staticRenderFns,
+  false,
+  null,
+  "78e071da",
+  null
+  
+)
+
+/* harmony default export */ var default_take_photo_dialog = (default_take_photo_dialog_component.exports);
 ;// 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/index.js??vue-loader-options!./packages/id-card-reader/id-card-reader-button/src/id-card-reader-button.vue?vue&type=script&lang=js&
 
 
@@ -87024,6 +87184,7 @@ _defineProperty(HuaShiService, "requestStore", []);
 
 
 
+
 /* harmony default export */ var id_card_reader_buttonvue_type_script_lang_js_ = ({
   name: 'id-card-reader-button',
   props: {
@@ -87196,10 +87357,9 @@ _defineProperty(HuaShiService, "requestStore", []);
       switch (this.readMachineType) {
         case 0:
           {
-            const realPicture = await CameraReadService.read();
-            this.$emit('click', {
-              faceimg: realPicture
-            });
+            // const realPicture = await CameraReadService.read()
+            // this.$emit('click', { faceimg: realPicture })
+            this.readFacePhotoByDefault();
             break;
           }
         case 1:
@@ -87323,6 +87483,29 @@ _defineProperty(HuaShiService, "requestStore", []);
         parent: this
       }).$mount(modalNode);
     },
+    // 默认浏览器自带拍照
+    readFacePhotoByDefault() {
+      const modalNode = document.createElement('div');
+      document.body.appendChild(modalNode);
+      const vm = new (external_commonjs_vue_commonjs2_vue_root_Vue_default())({
+        render: h => {
+          return h(default_take_photo_dialog, {
+            props: {},
+            on: {
+              close: data => {
+                if (data) {
+                  console.log('浏览器自带拍照=>', data);
+                  this.$emit('click', data);
+                }
+                vm.$destroy();
+                vm.$el.remove();
+              }
+            }
+          });
+        },
+        parent: this
+      }).$mount(modalNode);
+    },
     readLSIDCard() {
       this.showIDCardChrome = true;
       this.$nextTick(async () => {
@@ -87351,11 +87534,11 @@ _defineProperty(HuaShiService, "requestStore", []);
 ;
 var id_card_reader_button_component = normalizeComponent(
   src_id_card_reader_buttonvue_type_script_lang_js_,
-  id_card_reader_buttonvue_type_template_id_019a341e_scoped_true_render,
-  id_card_reader_buttonvue_type_template_id_019a341e_scoped_true_staticRenderFns,
+  id_card_reader_buttonvue_type_template_id_5ba8415b_scoped_true_render,
+  id_card_reader_buttonvue_type_template_id_5ba8415b_scoped_true_staticRenderFns,
   false,
   null,
-  "019a341e",
+  "5ba8415b",
   null
   
 )