eoss-ui 0.6.66 → 0.6.68

package/packages/calogin/src/main.vue

@@ -1,6 +1,8 @@
 <template>
-  <span @click="getCertificate">
-    <slot></slot>
+  <span>
+    <span @click="getCertificate">
+      <slot></slot>
+    </span>
   </span>
 </template>
 
@@ -11,6 +13,10 @@ import caPlugin from './plugin.js';
 export default {
   name: 'EsCaLogin',
   props: {
+    caModel: {
+      type: String,
+      required: true
+    }, // CA登录方式，JIDA-吉大正元，SHU_GUANG-曙光，SICHUAN-四川
     identifyingId: {
       type: String,
       default() {
@@ -38,7 +44,12 @@ export default {
   },
   data() {
     return {
-      signedData: ''
+      userList: [],
+      signedData: '', //证书原文
+      b64originData: '', //签名原文
+      b64SignData: '', //签名结果
+      idCard: '',
+      certId: ''
     };
   },
   computed: {
@@ -66,63 +77,289 @@ export default {
   methods: {
     init() {
       if (!window.PNXClient) {
-        const parser = new DOMParser();
-        const doc = parser.parseFromString(
-          "<object classid='clsid:9DD991F7-6FB0-4004-95A4-0A55006A8C42' width='0' height='0' id='PNXClient' style='position: absolute;'></object>",
-          'text/html'
-        );
-        const pnxClientElement = doc.querySelector('object');
-        if (pnxClientElement) {
-          document.body.appendChild(pnxClientElement);
-        }
+        // 创建 object 元素
+        const pnxClientElement = document.createElement('object');
+        pnxClientElement.classid = 'clsid:9DD991F7-6FB0-4004-95A4-0A55006A8C42';
+        pnxClientElement.width = '0';
+        pnxClientElement.height = '0';
+        pnxClientElement.id = 'PNXClient';
+        pnxClientElement.style.position = 'absolute';
+        document.body.appendChild(pnxClientElement);
       }
     },
     getCertificate() {
+      this.$emit('click');
       // 检查 PNXClient 是否存在
       if (!window.PNXClient) {
         this.$message.error('控件加载失败，请刷新页面重试！');
+        this.$emit('error');
         return;
       }
-      try {
-        caPlugin.getVersion();
-      } catch (e) {
-        this.$message.error('未安装控件，请进行安装控件！');
-        return;
-      }
-      try {
-        // 清除之前的过滤器
-        caPlugin.clearFilter();
-        // 初始化vctk控件
-        caPlugin.initialize('', this.param);
-        // 控制证书为一个时，不弹出证书选择框
-        caPlugin.setChooseSingleCert(1);
-
-        // 生成签名信息
-        this.signedData = caPlugin.p7SignString(this.identifyingId, true, true);
-
-        //获取错误码
-        const errorCode = Number(caPlugin.getLastError());
-        if (errorCode !== 0) {
-          if (errorCode === 3758096386 || errorCode === 2148532334) {
-            this.$message.error('用户取消操作！');
+      switch (this.caModel) {
+        //吉大正元:
+        case 'JIDA':
+          try {
+            caPlugin.getVersion();
+          } catch (e) {
+            this.$message.error('未安装控件，请进行安装控件！');
+            this.$emit('error');
             return;
-          } else if (errorCode === -536870815 || errorCode === 3758096481) {
-            this.$message.error(
-              '没有找到有效的证书，如果使用的是KEY，请确认已经插入key！'
+          }
+          try {
+            // 清除之前的过滤器
+            caPlugin.clearFilter();
+            // 初始化vctk控件
+            caPlugin.initialize('', this.param);
+            // 控制证书为一个时，不弹出证书选择框
+            caPlugin.setChooseSingleCert(1);
+
+            // 生成签名信息
+            this.signedData = caPlugin.p7SignString(
+              this.identifyingId,
+              true,
+              true
             );
-            return;
-          } else {
-            this.$message.error(caPlugin.getLastErrorMessage());
-            return;
+
+            //获取错误码
+            const errorCode = Number(caPlugin.getLastError());
+            if (errorCode !== 0) {
+              if (errorCode === 3758096386 || errorCode === 2148532334) {
+                this.$message.error('用户取消操作！');
+                this.$emit('error');
+                return;
+              } else if (errorCode === -536870815 || errorCode === 3758096481) {
+                this.$message.error(
+                  '没有找到有效的证书，如果使用的是KEY，请确认已经插入key！'
+                );
+                this.$emit('error');
+                return;
+              } else {
+                this.$message.error(caPlugin.getLastErrorMessage());
+                this.$emit('error');
+                return;
+              }
+            }
+            this.success && this.success(this.signedData);
+            return this.signedData;
+          } catch (error) {
+            // 捕获其他可能的异常
+            this.$message.error(`操作失败: ${error.message}`);
+            this.$emit('error');
           }
-        }
-        console.log('签名数据:', this.signedData);
-        this.success && this.success(this.signedData);
-        return this.signedData;
-      } catch (error) {
-        // 捕获其他可能的异常
-        this.$message.error(`操作失败: ${error.message}`);
+          break;
+        //曙光:
+        case 'SHU_GUANG':
+          caPlugin
+            .getMessage({ action: 'SOF_GetUserList' })
+            .then((res) => {
+              const { retCode, retMsg, retValue } = res;
+              if (!retValue || retCode !== 0) {
+                this.$message.error(
+                  retCode !== 0 ? retMsg : '未找到证书，请插入证书UKEY！'
+                );
+                this.$emit('error');
+                return;
+              }
+              const userList = retValue.split('&&&');
+              if (userList.length === 1) {
+                //如果只有一个证书，直接获取证书信息
+                this.certId = userList[0].split('||')[1];
+                this.getCertInfo(this.certId);
+              } else {
+                // 如果有多个证书，弹出选择框
+                this.userList = userList.map((item) => {
+                  const [name, certId] = item.split('||');
+                  return { label: name, value: certId };
+                });
+                this.$prompt('', '证书选择', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  inputPattern: /^.+$/,
+                  inputErrorMessage: '请选择证书！',
+                  selectData: this.userList
+                })
+                  .then((res) => {
+                    this.certId = res.value;
+                    this.getCertInfo(this.certId);
+                  })
+                  .catch(() => {
+                    this.$emit('error');
+                  });
+              }
+            })
+            .catch((err) => {
+              this.$message.error('请检查是否安装并启用证书助手控件！');
+              this.$emit('error');
+            });
+          break;
+        //四川:
+        case 'SICHUAN':
+          this.$message.warning('四川CA登录方式对接中！');
+          this.$emit('error');
+          break;
       }
+    },
+    getCertInfo(name) {
+      caPlugin
+        .getMessage({ action: 'SOF_ExportUserCert', params: [name] })
+        .then((res) => {
+          const { retCode, retMsg, retValue } = res;
+          if (retCode !== 0) {
+            this.$message.error(retMsg);
+            this.$emit('error');
+            return;
+          }
+          //设置证书原文
+          this.signedData = retValue
+            .replace('-----BEGIN CERTIFICATE-----', '')
+            .replace('-----END CERTIFICATE-----', '');
+          caPlugin
+            .getMessage({
+              action: 'SOF_GetCertInfo',
+              params: [retValue, 'SGD_CERT_SUBJECT_SN']
+            })
+            .then((res) => {
+              const { retCode, retMsg, retValue } = res;
+              if (retCode !== 0) {
+                this.$message.error(retMsg);
+                this.$emit('error');
+                return;
+              }
+              this.idCard = caPlugin.base64Decode(retValue);
+              caPlugin
+                .getMessage({
+                  action: 'SOF_GenRandom',
+                  params: [16]
+                })
+                .then((res) => {
+                  const { retCode, retMsg, retValue } = res;
+                  if (retCode !== 0) {
+                    this.$message.error(retMsg);
+                    this.$emit('error');
+                    return;
+                  }
+                  this.b64originData = retValue + this.identifyingId;
+                  caPlugin
+                    .getMessage({
+                      action: 'SOF_SignData',
+                      params: [
+                        this.certId,
+                        caPlugin.base64Encode(this.b64originData)
+                      ]
+                    })
+                    .then((res) => {
+                      const { retCode, retMsg, retValue } = res;
+                      if (retCode !== 0) {
+                        if (retCode === 184550659) {
+                          this.cerLogin();
+                        } else {
+                          this.$message.error(retMsg);
+                          this.$emit('error');
+                        }
+                        return;
+                      }
+                      this.b64SignData = retValue;
+                      this.success &&
+                        this.success({
+                          identifyingId: this.identifyingId,
+                          signedData: this.signedData, //证书原文
+                          b64originData: this.b64originData, //签名原文
+                          b64SignData: this.b64SignData, //签名结果
+                          idCard: this.idCard,
+                          certId: this.certId
+                        });
+                    })
+                    .catch((err) => {
+                      this.$emit('error');
+                    });
+                })
+                .catch((err) => {
+                  this.$emit('error');
+                });
+            })
+            .catch((err) => {
+              this.$emit('error');
+            });
+        })
+        .catch((err) => {
+          this.$emit('error');
+        });
+    },
+    cerLogin(title = '提示') {
+      this.$prompt('输入密码', title, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputPattern: /^[[\x21-\x7E]{6,16}$/,
+        inputErrorMessage: '请输入密码'
+      })
+        .then(({ value }) => {
+          caPlugin
+            .getMessage({
+              action: 'SOF_Login',
+              params: [this.certId, value]
+            })
+            .then((res) => {
+              const { retCode, retMsg, retValue } = res;
+              if (retCode !== 0 || retValue === false) {
+                if (retValue === false) {
+                  caPlugin
+                    .getMessage({
+                      action: 'SOF_GetPinRetryCount',
+                      params: [this.certId]
+                    })
+                    .then((res) => {
+                      const { retValue } = res;
+                      this.cerLogin(
+                        `登录失败！剩余口令重试次数：${retValue}次`
+                      );
+                    });
+                  return;
+                }
+                this.$message.error(retMsg);
+                this.$emit('error');
+                return;
+              }
+              caPlugin
+                .getMessage({
+                  action: 'SOF_SignData',
+                  params: [
+                    this.certId,
+                    caPlugin.base64Encode(this.b64originData)
+                  ]
+                })
+                .then((res) => {
+                  const { retCode, retMsg, retValue } = res;
+                  if (retCode !== 0) {
+                    if (retCode === 184550659) {
+                      this.cerLogin();
+                    } else {
+                      this.$message.error(retMsg);
+                      this.$emit('error');
+                    }
+                    return;
+                  }
+                  this.b64SignData = retValue;
+                  this.success &&
+                    this.success({
+                      identifyingId: this.identifyingId,
+                      signedData: this.signedData, //证书原文
+                      b64originData: this.b64originData, //签名原文
+                      b64SignData: this.b64SignData, //签名结果
+                      idCard: this.idCard,
+                      certId: this.certId
+                    });
+                })
+                .catch((err) => {
+                  this.$emit('error');
+                });
+            })
+            .catch(() => {
+              this.$emit('error');
+            });
+        })
+        .catch(() => {
+          this.$emit('error');
+        });
     }
   }
 };

package/packages/calogin/src/plugin.js

@@ -6,6 +6,8 @@ class CA_ExtInterface {
     this.currentSessionWSURL = '';
     this.useActioveX = false;
     this.options = {};
+    this.webSocket = null;
+    this.init();
   }
 
   /**
@@ -742,6 +744,171 @@ class CA_ExtInterface {
       return result.value;
     }
   }
+  /*
+   *曙光四川CA
+   *'SOF_GetUserList' 证书列表
+   *'SOF_ExportUserCert' 导出证书
+   *'SOF_GetCertInfo': 获取证书信息
+   *'SOF_GenRandom': 生成随机数
+   *'SOF_SignData': 获取证书签名
+   *'SOF_Login': 登录证书
+   *'SOF_GetPinRetryCount': 剩余次数
+   */
+  /**
+   *
+   * 获取webSocket消息
+  * @returns {string}
+   */
+  getMessage({ action, params = [] }) {
+    return new Promise((resolve, reject) => {
+      var obj = JSON.stringify({
+        'action': action,
+        'params': params
+      });
+      if (!this.webSocket) {
+        this.webSocket = new WebSocket('wss://localhost:36171');
+        this.webSocket.onerror = (event) => {
+          this.webSocket = null;
+          reject(event);
+        };
+        this.webSocket.onopen = () => {
+          this.webSocket.send(obj);
+        };
+      } else {
+        this.webSocket.send(obj);
+      }
+      this.webSocket.onclose = (event) => {
+        this.webSocket = null;
+      };
+      this.webSocket.onmessage = (event) => {
+        resolve(JSON.parse(event.data));
+      };
+    });
+  }
+  /**
+   *
+   * base64解码
+  * @returns {string} base64解码后的字符串
+   */
+  base64Decode(res) {
+    let _keyStr = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+    let val = '';
+    let chr1;
+    let chr2;
+    let chr3;
+    let enc1;
+    let enc2;
+    let enc3;
+    let enc4;
+    let i = 0;
+    res = res.replace(/[^A-Za-z0-9\+\/\=]/g, '');
+    while (i < res.length) {
+      enc1 = _keyStr.indexOf(res.charAt(i++));
+      enc2 = _keyStr.indexOf(res.charAt(i++));
+      enc3 = _keyStr.indexOf(res.charAt(i++));
+      enc4 = _keyStr.indexOf(res.charAt(i++));
+      chr1 = (enc1 << 2) | (enc2 >> 4);
+      chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+      chr3 = ((enc3 & 3) << 6) | enc4;
+      val = val + String.fromCharCode(chr1);
+      if (enc3 !== 64) {
+        val = val + String.fromCharCode(chr2);
+      }
+      if (enc4 !== 64) {
+        val = val + String.fromCharCode(chr3);
+      }
+    }
+    val = this.utf8_decode(val);
+    return val;
+  }
+  /**
+   *
+   * base64编码
+  * @returns {string} base64编码后的字符串
+   */
+  base64Encode(res) {
+    let _keyStr = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+    let val = '';
+    let chr1;
+    let chr2;
+    let chr3;
+    let enc1;
+    let enc2;
+    let enc3;
+    let enc4;
+    let i = 0;
+    res = this.utf8_encode(res);
+    while (i < res.length) {
+      chr1 = res.charCodeAt(i++);
+      chr2 = res.charCodeAt(i++);
+      chr3 = res.charCodeAt(i++);
+      enc1 = chr1 >> 2;
+      enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+      enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+      enc4 = chr3 & 63;
+      if (isNaN(chr2)) {
+        enc3 = enc4 = 64;
+      } else if (isNaN(chr3)) {
+        enc4 = 64;
+      }
+      val = val + _keyStr.charAt(enc1) + _keyStr.charAt(enc2) + _keyStr.charAt(enc3) + _keyStr.charAt(enc4);
+    }
+    return val;
+  }
+  /**
+   *
+   * utf8解码
+  * @returns {string} utf8解码后的字符串
+   */
+  utf8_decode(utftext) {
+    let string = '';
+    let i = 0;
+    let c = 0;
+    // let c1 = 0;
+    let c2 = 0;
+    let c3 = 0;
+    while (i < utftext.length) {
+      c = utftext.charCodeAt(i);
+      if (c < 128) {
+        string += String.fromCharCode(c);
+        i++;
+      } else if ((c > 191) && (c < 224)) {
+        c2 = utftext.charCodeAt(i + 1);
+        string += String.fromCharCode(((c & 31) << 6) | (c2 & 63));
+        i += 2;
+      } else {
+        c2 = utftext.charCodeAt(i + 1);
+        c3 = utftext.charCodeAt(i + 2);
+        string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));
+        i += 3;
+      }
+    }
+    return string;
+  }
+  /**
+   *
+   * utf8编码
+  * @returns {string} utf8编码后的字符串
+   */
+  utf8_encode(string) {
+    string = string.replace(/\r\n/g, '\n');
+    var utftext = '';
+    for (var n = 0; n < string.length; n++) {
+      var c = string.charCodeAt(n);
+      if (c < 128) {
+        utftext += String.fromCharCode(c);
+      } else if ((c > 127) && (c < 2048)) {
+        utftext += String.fromCharCode((c >> 6) | 192);
+        utftext += String.fromCharCode((c & 63) | 128);
+      } else {
+        utftext += String.fromCharCode((c >> 12) | 224);
+        utftext += String.fromCharCode(((c >> 6) & 63) | 128);
+        utftext += String.fromCharCode((c & 63) | 128);
+      }
+
+    }
+    return utftext;
+  }
 }
 
 const caPlugin = new CA_ExtInterface();

package/packages/flow/src/component/Circulate.vue

@@ -89,6 +89,7 @@ import {
   getNotificationMsg,
   findCodeValues,
   directStartTaskCircularRead,
+  endFlowAndStartTaskCircularRead,
 } from 'eoss-ui/src/config/api';
 import util from 'eoss-ui/src/utils/util.js';
 export default {
@@ -202,7 +203,7 @@ export default {
       } 
      
       const param = {
-        url: directStartTaskCircularRead,
+        url:this.showBtn ? directStartTaskCircularRead : endFlowAndStartTaskCircularRead,
         data: {
           opinion,
           businessId,
@@ -220,6 +221,10 @@ export default {
         headers: { Accept: 'application/json,text/plain' },
         method: 'POST'
       };
+      if(!this.showBtn){
+        param.data.pendingId = this.pendingId;
+        delete param.data.processDefinitionId;
+      }
       this.loading = true;
       util
         .ajax(param)

package/packages/flow/src/main.vue

@@ -40,6 +40,7 @@
         :businessId="businessId"
         ref="circulate"
         :selectorParams="params"
+        :pending-id="pendingId"
         :showBtn="false"
         :processDefinitionId="nodeInfo.nextNode"
         :simpleTips="simpleTips"
@@ -81,6 +82,7 @@
       :appId="resetAppId"
       @cancel="closeProcess($event)"
       :flowParams="param"
+      :subParams="subParams"
       v-else-if="newTypeCode == 'reset' || newTypeCode == 'continuation'"
     />
     <div class="es-flow-content" v-else>
@@ -1032,6 +1034,10 @@ export default {
       type: Object,
       default: () => {}
     },
+    subParams: {
+      type: Object,
+      default: () => {}
+    },
     width: {
       type: String
     },

package/packages/flow/src/reset.vue

@@ -237,6 +237,10 @@ export default {
     flowParams: {
       type: Object,
       default: () => {}
+    },
+     subParams: {
+      type: Object,
+      default: () => {}
     },
     appId: {
       type: String,
@@ -572,7 +576,8 @@ export default {
               this.mixPresetList && this.mixPresetList.length > 0
                 ? this.mixPresetList.join('|')
                 : presetReadUserId.join(','),
-            opinion: this.newOpinion || newOpinion
+            opinion: this.newOpinion || newOpinion,
+            ...this.subParams
           };
           if (this.activeNames != '1') delete params.customPresetUserJson;
           util

package/packages/flow/src/selectUser.vue

@@ -77,7 +77,7 @@
         :multiple="newMultiple"
         @cancel="cancelSelectUser"
         @change="getSelectUser"
-        :param="newParams"
+        :param="{...newParams,info:'no'}"
         :disableds="disableds"
         ><i class="es-icon-user"></i
       ></es-selector>