eoss-ui 0.6.68 → 0.6.69

package/packages/calogin/src/main.vue

@@ -13,6 +13,7 @@ import caPlugin from './plugin.js';
 export default {
   name: 'EsCaLogin',
   props: {
+    installPath: String,
     caModel: {
       type: String,
       required: true
@@ -92,7 +93,7 @@ export default {
       // 检查 PNXClient 是否存在
       if (!window.PNXClient) {
         this.$message.error('控件加载失败，请刷新页面重试！');
-        this.$emit('error');
+        this.$emit('error', { code: 0, msg: '控件加载失败，请刷新页面重试！' });
         return;
       }
       switch (this.caModel) {
@@ -101,8 +102,23 @@ export default {
           try {
             caPlugin.getVersion();
           } catch (e) {
-            this.$message.error('未安装控件，请进行安装控件！');
-            this.$emit('error');
+            if (this.installPath) {
+              this.$confirm('未安装控件，请进行安装控件！', '控件下载', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              })
+                .then(() => {
+                  window.open(this.installPath);
+                })
+                .catch(() => {});
+            } else {
+              this.$message.error('未安装控件，请进行安装控件！');
+            }
+            this.$emit('error', {
+              type: 1,
+              msg: '未安装控件，请进行安装控件！'
+            });
             return;
           }
           try {
@@ -125,17 +141,21 @@ export default {
             if (errorCode !== 0) {
               if (errorCode === 3758096386 || errorCode === 2148532334) {
                 this.$message.error('用户取消操作！');
-                this.$emit('error');
+                this.$emit('error', { code: 52, msg: '用户取消操作！' });
                 return;
               } else if (errorCode === -536870815 || errorCode === 3758096481) {
                 this.$message.error(
                   '没有找到有效的证书，如果使用的是KEY，请确认已经插入key！'
                 );
-                this.$emit('error');
+                this.$emit('error', {
+                  type: 2,
+                  msg: '没有找到有效的证书，如果使用的是KEY，请确认已经插入key！'
+                });
                 return;
               } else {
-                this.$message.error(caPlugin.getLastErrorMessage());
-                this.$emit('error');
+                const msg = caPlugin.getLastErrorMessage();
+                this.$message.error(msg);
+                this.$emit('error', { code: 3, msg });
                 return;
               }
             }
@@ -144,7 +164,7 @@ export default {
           } catch (error) {
             // 捕获其他可能的异常
             this.$message.error(`操作失败: ${error.message}`);
-            this.$emit('error');
+            this.$emit('error', { code: 4, msg: error.message });
           }
           break;
         //曙光:
@@ -157,7 +177,10 @@ export default {
                 this.$message.error(
                   retCode !== 0 ? retMsg : '未找到证书，请插入证书UKEY！'
                 );
-                this.$emit('error');
+                this.$emit('error', {
+                  type: 2,
+                  msg: retCode !== 0 ? retMsg : '未找到证书，请插入证书UKEY！'
+                });
                 return;
               }
               const userList = retValue.split('&&&');
@@ -183,13 +206,32 @@ export default {
                     this.getCertInfo(this.certId);
                   })
                   .catch(() => {
-                    this.$emit('error');
+                    this.$emit('error', { code: 52, msg: '用户取消操作！' });
                   });
               }
             })
             .catch((err) => {
-              this.$message.error('请检查是否安装并启用证书助手控件！');
-              this.$emit('error');
+              if (this.installPath) {
+                this.$confirm(
+                  '请检查是否安装并启用证书助手控件！',
+                  '控件下载',
+                  {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                  }
+                )
+                  .then(() => {
+                    window.open(this.installPath);
+                  })
+                  .catch(() => {});
+              } else {
+                this.$message.error('请检查是否安装并启用证书助手控件！');
+              }
+              this.$emit('error', {
+                type: 1,
+                msg: '请检查是否安装并启用证书助手控件！'
+              });
             });
           break;
         //四川:
@@ -206,7 +248,7 @@ export default {
           const { retCode, retMsg, retValue } = res;
           if (retCode !== 0) {
             this.$message.error(retMsg);
-            this.$emit('error');
+            this.$emit('error', { code: retCode, msg: retMsg });
             return;
           }
           //设置证书原文
@@ -222,7 +264,7 @@ export default {
               const { retCode, retMsg, retValue } = res;
               if (retCode !== 0) {
                 this.$message.error(retMsg);
-                this.$emit('error');
+                this.$emit('error', { code: retCode, msg: retMsg });
                 return;
               }
               this.idCard = caPlugin.base64Decode(retValue);
@@ -235,7 +277,7 @@ export default {
                   const { retCode, retMsg, retValue } = res;
                   if (retCode !== 0) {
                     this.$message.error(retMsg);
-                    this.$emit('error');
+                    this.$emit('error', { code: retCode, msg: retMsg });
                     return;
                   }
                   this.b64originData = retValue + this.identifyingId;
@@ -254,7 +296,7 @@ export default {
                           this.cerLogin();
                         } else {
                           this.$message.error(retMsg);
-                          this.$emit('error');
+                          this.$emit('error', { code: retCode, msg: retMsg });
                         }
                         return;
                       }
@@ -270,19 +312,19 @@ export default {
                         });
                     })
                     .catch((err) => {
-                      this.$emit('error');
+                      this.$emit('error', { code: 5, msg: err });
                     });
                 })
                 .catch((err) => {
-                  this.$emit('error');
+                  this.$emit('error', { code: 6, msg: err });
                 });
             })
             .catch((err) => {
-              this.$emit('error');
+              this.$emit('error', { code: 7, msg: err });
             });
         })
         .catch((err) => {
-          this.$emit('error');
+          this.$emit('error', { code: 8, msg: err });
         });
     },
     cerLogin(title = '提示') {
@@ -316,7 +358,7 @@ export default {
                   return;
                 }
                 this.$message.error(retMsg);
-                this.$emit('error');
+                this.$emit('error', { code: retCode, msg: retMsg });
                 return;
               }
               caPlugin
@@ -334,7 +376,7 @@ export default {
                       this.cerLogin();
                     } else {
                       this.$message.error(retMsg);
-                      this.$emit('error');
+                      this.$emit('error', { code: retCode, msg: retMsg });
                     }
                     return;
                   }
@@ -350,15 +392,15 @@ export default {
                     });
                 })
                 .catch((err) => {
-                  this.$emit('error');
+                  this.$emit('error', { code: 9, msg: err });
                 });
             })
             .catch(() => {
-              this.$emit('error');
+              this.$emit('error', { code: 10, msg: err });
             });
         })
         .catch(() => {
-          this.$emit('error');
+          this.$emit('error', { code: 11, msg: err });
         });
     }
   }

package/packages/flow/src/main.vue

@@ -2861,6 +2861,8 @@ export default {
       ) {
         this.flowSuccess(true);
         // this.$emit('success');
+      }else{
+        this.$emit('cancel')
       }
     },
     /**

package/packages/flow/src/selectUser.vue

@@ -74,6 +74,7 @@
             ? ''
             : 'no-icon'
         "
+        :where="newWhere"
         :multiple="newMultiple"
         @cancel="cancelSelectUser"
         @change="getSelectUser"
@@ -183,6 +184,11 @@ export default {
       newRadioList: []
     };
   },
+  computed:{
+    newWhere(){
+      return {mid:`${JSON.parse(util.getStorage('mainConfig')).userModel.orgId}-org-1`,...this.where}
+    }
+  },
   watch: {
     newPresetEdit(val) {
       this.isChange = false;

package/packages/login/src/main.vue

@@ -492,7 +492,7 @@
     </es-dialog>
     <transition name="launch-fade">
       <div class="es-launch-image" :style="_launchImage" v-show="showLaunch">
-        <p class="es-launch-text es-launch-user-name">{{ userName }}，你好！</p>
+        <p class="es-launch-text es-launch-user-name">{{ userName }}，您好！</p>
         <p class="es-launch-text es-launch-system-name">
           欢迎进入{{ sysName }}
         </p>
@@ -501,6 +501,7 @@
     <es-ca-login
       v-if="isCaLogin"
       ref="calogin"
+      :install-path="installPath"
       :ca-model="caLoginModel"
       :identifyingId="identifyingId"
       :success="caLogin"
@@ -775,7 +776,8 @@ export default {
         return [];
       }
     },
-    caModel: String
+    caModel: String,
+    caInstallPath: String
   },
   computed: {
     transform() {
@@ -1043,7 +1045,8 @@ export default {
       launchKey: 'day',
       launchTime: 2000,
       switchActive: this.switchsActive,
-      loginDownloadApp: this.loginDownloadApps
+      loginDownloadApp: this.loginDownloadApps,
+      installPath: this.caInstallPath
     };
   },
   beforeCreate() {
@@ -1478,6 +1481,9 @@ export default {
         if (res.subsystemExtend.loginDownloadApp) {
           this.loginDownloadApp = res.subsystemExtend.loginDownloadApp;
         }
+        if (res.subsystemExtend.caInstallPath) {
+          this.installPath = res.subsystemExtend.caInstallPath;
+        }
       }
       this.passModifyModel = res.passModifyModel;
       this.wechatAppid = res.wechatAppid;

package/src/index.js

@@ -125,7 +125,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.6.68',
+  version: '0.6.69',
   install,
   Button,
   ButtonGroup,

package/src/utils/util.js

@@ -549,8 +549,9 @@ const ajaxStream = function ({ controller, method = 'post', host, url, data, par
               try {
                 // 假设数据是 JSON 格式
                 const parsedData = JSON.parse(data);
-                info.time = parsedData.time;
-                info.conversationId = parsedData.conversationId;
+                info = { ...info, ...parsedData };
+                // info.time = parsedData.time;
+                // info.conversationId = parsedData.conversationId;
                 const thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
                 const match = parsedData.message.match(thinkRegex);
                 if (match) {