eoss-ui 0.6.68 → 0.6.69

package/lib/button-group.js

@@ -586,8 +586,9 @@ var ajaxStream = function ajaxStream(_ref2) {
             try {
               // 假设数据是 JSON 格式
               var parsedData = JSON.parse(data);
-              info.time = parsedData.time;
-              info.conversationId = parsedData.conversationId;
+              info = _extends({}, info, parsedData);
+              // info.time = parsedData.time;
+              // info.conversationId = parsedData.conversationId;
               var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
               var match = parsedData.message.match(thinkRegex);
               if (match) {

package/lib/button.js

@@ -587,8 +587,9 @@ var ajaxStream = function ajaxStream(_ref2) {
             try {
               // 假设数据是 JSON 格式
               var parsedData = JSON.parse(data);
-              info.time = parsedData.time;
-              info.conversationId = parsedData.conversationId;
+              info = _extends({}, info, parsedData);
+              // info.time = parsedData.time;
+              // info.conversationId = parsedData.conversationId;
               var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
               var match = parsedData.message.match(thinkRegex);
               if (match) {

package/lib/calogin.js

@@ -586,8 +586,9 @@ var ajaxStream = function ajaxStream(_ref2) {
             try {
               // 假设数据是 JSON 格式
               var parsedData = JSON.parse(data);
-              info.time = parsedData.time;
-              info.conversationId = parsedData.conversationId;
+              info = _extends({}, info, parsedData);
+              // info.time = parsedData.time;
+              // info.conversationId = parsedData.conversationId;
               var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
               var match = parsedData.message.match(thinkRegex);
               if (match) {
@@ -4254,7 +4255,7 @@ module.exports = require("sm-crypto");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/calogin/src/main.vue?vue&type=template&id=3ba625d0&scoped=true&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/calogin/src/main.vue?vue&type=template&id=4b7c35fc&scoped=true&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4267,7 +4268,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/calogin/src/main.vue?vue&type=template&id=3ba625d0&scoped=true&
+// CONCATENATED MODULE: ./packages/calogin/src/main.vue?vue&type=template&id=4b7c35fc&scoped=true&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -5325,6 +5326,7 @@ var caPlugin = new CA_ExtInterface();
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
   name: 'EsCaLogin',
   props: {
+    installPath: String,
     caModel: {
       type: String,
       required: true
@@ -5395,7 +5397,7 @@ var caPlugin = new CA_ExtInterface();
       // 检查 PNXClient 是否存在
       if (!window.PNXClient) {
         this.$message.error('控件加载失败，请刷新页面重试！');
-        this.$emit('error');
+        this.$emit('error', { code: 0, msg: '控件加载失败，请刷新页面重试！' });
         return;
       }
       switch (this.caModel) {
@@ -5404,8 +5406,21 @@ var caPlugin = new CA_ExtInterface();
           try {
             src_plugin.getVersion();
           } catch (e) {
-            this.$message.error('未安装控件，请进行安装控件！');
-            this.$emit('error');
+            if (this.installPath) {
+              this.$confirm('未安装控件，请进行安装控件！', '控件下载', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(function () {
+                window.open(_this.installPath);
+              }).catch(function () {});
+            } else {
+              this.$message.error('未安装控件，请进行安装控件！');
+            }
+            this.$emit('error', {
+              type: 1,
+              msg: '未安装控件，请进行安装控件！'
+            });
             return;
           }
           try {
@@ -5424,15 +5439,19 @@ var caPlugin = new CA_ExtInterface();
             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(src_plugin.getLastErrorMessage());
-                this.$emit('error');
+                var msg = src_plugin.getLastErrorMessage();
+                this.$message.error(msg);
+                this.$emit('error', { code: 3, msg: msg });
                 return;
               }
             }
@@ -5441,7 +5460,7 @@ var caPlugin = new CA_ExtInterface();
           } catch (error) {
             // 捕获其他可能的异常
             this.$message.error('\u64CD\u4F5C\u5931\u8D25: ' + error.message);
-            this.$emit('error');
+            this.$emit('error', { code: 4, msg: error.message });
           }
           break;
         //曙光:
@@ -5453,7 +5472,10 @@ var caPlugin = new CA_ExtInterface();
 
             if (!retValue || retCode !== 0) {
               _this.$message.error(retCode !== 0 ? retMsg : '未找到证书，请插入证书UKEY！');
-              _this.$emit('error');
+              _this.$emit('error', {
+                type: 2,
+                msg: retCode !== 0 ? retMsg : '未找到证书，请插入证书UKEY！'
+              });
               return;
             }
             var userList = retValue.split('&&&');
@@ -5480,12 +5502,25 @@ var caPlugin = new CA_ExtInterface();
                 _this.certId = res.value;
                 _this.getCertInfo(_this.certId);
               }).catch(function () {
-                _this.$emit('error');
+                _this.$emit('error', { code: 52, msg: '用户取消操作！' });
               });
             }
           }).catch(function (err) {
-            _this.$message.error('请检查是否安装并启用证书助手控件！');
-            _this.$emit('error');
+            if (_this.installPath) {
+              _this.$confirm('请检查是否安装并启用证书助手控件！', '控件下载', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(function () {
+                window.open(_this.installPath);
+              }).catch(function () {});
+            } else {
+              _this.$message.error('请检查是否安装并启用证书助手控件！');
+            }
+            _this.$emit('error', {
+              type: 1,
+              msg: '请检查是否安装并启用证书助手控件！'
+            });
           });
           break;
         //四川:
@@ -5505,7 +5540,7 @@ var caPlugin = new CA_ExtInterface();
 
         if (retCode !== 0) {
           _this2.$message.error(retMsg);
-          _this2.$emit('error');
+          _this2.$emit('error', { code: retCode, msg: retMsg });
           return;
         }
         //设置证书原文
@@ -5520,7 +5555,7 @@ var caPlugin = new CA_ExtInterface();
 
           if (retCode !== 0) {
             _this2.$message.error(retMsg);
-            _this2.$emit('error');
+            _this2.$emit('error', { code: retCode, msg: retMsg });
             return;
           }
           _this2.idCard = src_plugin.base64Decode(retValue);
@@ -5534,7 +5569,7 @@ var caPlugin = new CA_ExtInterface();
 
             if (retCode !== 0) {
               _this2.$message.error(retMsg);
-              _this2.$emit('error');
+              _this2.$emit('error', { code: retCode, msg: retMsg });
               return;
             }
             _this2.b64originData = retValue + _this2.identifyingId;
@@ -5551,7 +5586,7 @@ var caPlugin = new CA_ExtInterface();
                   _this2.cerLogin();
                 } else {
                   _this2.$message.error(retMsg);
-                  _this2.$emit('error');
+                  _this2.$emit('error', { code: retCode, msg: retMsg });
                 }
                 return;
               }
@@ -5565,16 +5600,16 @@ var caPlugin = new CA_ExtInterface();
                 certId: _this2.certId
               });
             }).catch(function (err) {
-              _this2.$emit('error');
+              _this2.$emit('error', { code: 5, msg: err });
             });
           }).catch(function (err) {
-            _this2.$emit('error');
+            _this2.$emit('error', { code: 6, msg: err });
           });
         }).catch(function (err) {
-          _this2.$emit('error');
+          _this2.$emit('error', { code: 7, msg: err });
         });
       }).catch(function (err) {
-        _this2.$emit('error');
+        _this2.$emit('error', { code: 8, msg: err });
       });
     },
     cerLogin: function cerLogin() {
@@ -5611,7 +5646,7 @@ var caPlugin = new CA_ExtInterface();
               return;
             }
             _this3.$message.error(retMsg);
-            _this3.$emit('error');
+            _this3.$emit('error', { code: retCode, msg: retMsg });
             return;
           }
           src_plugin.getMessage({
@@ -5627,7 +5662,7 @@ var caPlugin = new CA_ExtInterface();
                 _this3.cerLogin();
               } else {
                 _this3.$message.error(retMsg);
-                _this3.$emit('error');
+                _this3.$emit('error', { code: retCode, msg: retMsg });
               }
               return;
             }
@@ -5641,13 +5676,13 @@ var caPlugin = new CA_ExtInterface();
               certId: _this3.certId
             });
           }).catch(function (err) {
-            _this3.$emit('error');
+            _this3.$emit('error', { code: 9, msg: err });
           });
         }).catch(function () {
-          _this3.$emit('error');
+          _this3.$emit('error', { code: 10, msg: err });
         });
       }).catch(function () {
-        _this3.$emit('error');
+        _this3.$emit('error', { code: 11, msg: err });
       });
     }
   }
@@ -5671,7 +5706,7 @@ var component = Object(componentNormalizer["a" /* default */])(
   staticRenderFns,
   false,
   null,
-  "3ba625d0",
+  "4b7c35fc",
   null
   
 )

package/lib/checkbox-group.js

@@ -586,8 +586,9 @@ var ajaxStream = function ajaxStream(_ref2) {
             try {
               // 假设数据是 JSON 格式
               var parsedData = JSON.parse(data);
-              info.time = parsedData.time;
-              info.conversationId = parsedData.conversationId;
+              info = _extends({}, info, parsedData);
+              // info.time = parsedData.time;
+              // info.conversationId = parsedData.conversationId;
               var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
               var match = parsedData.message.match(thinkRegex);
               if (match) {

package/lib/data-table-form.js

@@ -586,8 +586,9 @@ var ajaxStream = function ajaxStream(_ref2) {
             try {
               // 假设数据是 JSON 格式
               var parsedData = JSON.parse(data);
-              info.time = parsedData.time;
-              info.conversationId = parsedData.conversationId;
+              info = _extends({}, info, parsedData);
+              // info.time = parsedData.time;
+              // info.conversationId = parsedData.conversationId;
               var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
               var match = parsedData.message.match(thinkRegex);
               if (match) {

package/lib/data-table.js

@@ -586,8 +586,9 @@ var ajaxStream = function ajaxStream(_ref2) {
             try {
               // 假设数据是 JSON 格式
               var parsedData = JSON.parse(data);
-              info.time = parsedData.time;
-              info.conversationId = parsedData.conversationId;
+              info = _extends({}, info, parsedData);
+              // info.time = parsedData.time;
+              // info.conversationId = parsedData.conversationId;
               var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
               var match = parsedData.message.match(thinkRegex);
               if (match) {

package/lib/date-picker.js

@@ -587,8 +587,9 @@ var ajaxStream = function ajaxStream(_ref2) {
             try {
               // 假设数据是 JSON 格式
               var parsedData = JSON.parse(data);
-              info.time = parsedData.time;
-              info.conversationId = parsedData.conversationId;
+              info = _extends({}, info, parsedData);
+              // info.time = parsedData.time;
+              // info.conversationId = parsedData.conversationId;
               var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
               var match = parsedData.message.match(thinkRegex);
               if (match) {

package/lib/dialog.js

@@ -586,8 +586,9 @@ var ajaxStream = function ajaxStream(_ref2) {
             try {
               // 假设数据是 JSON 格式
               var parsedData = JSON.parse(data);
-              info.time = parsedData.time;
-              info.conversationId = parsedData.conversationId;
+              info = _extends({}, info, parsedData);
+              // info.time = parsedData.time;
+              // info.conversationId = parsedData.conversationId;
               var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
               var match = parsedData.message.match(thinkRegex);
               if (match) {