eoss-ui 0.6.68 → 0.6.69

package/lib/eoss-ui.common.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) {
@@ -5883,8 +5884,8 @@ calendar_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var calendar = (calendar_src_main);
-// 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&
-var mainvue_type_template_id_3ba625d0_scoped_true_render = function () {
+// 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 mainvue_type_template_id_4b7c35fc_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -5892,11 +5893,11 @@ var mainvue_type_template_id_3ba625d0_scoped_true_render = function () {
     _c("span", { on: { click: _vm.getCertificate } }, [_vm._t("default")], 2),
   ])
 }
-var mainvue_type_template_id_3ba625d0_scoped_true_staticRenderFns = []
-mainvue_type_template_id_3ba625d0_scoped_true_render._withStripped = true
+var mainvue_type_template_id_4b7c35fc_scoped_true_staticRenderFns = []
+mainvue_type_template_id_4b7c35fc_scoped_true_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&
 
 // CONCATENATED MODULE: ./packages/calogin/src/plugin.js
 var plugin_typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
@@ -6951,6 +6952,7 @@ var caPlugin = new CA_ExtInterface();
 /* harmony default export */ var calogin_src_mainvue_type_script_lang_js_ = ({
   name: 'EsCaLogin',
   props: {
+    installPath: String,
     caModel: {
       type: String,
       required: true
@@ -7021,7 +7023,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) {
@@ -7030,8 +7032,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 {
@@ -7050,15 +7065,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;
               }
             }
@@ -7067,7 +7086,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;
         //曙光:
@@ -7079,7 +7098,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('&&&');
@@ -7106,12 +7128,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;
         //四川:
@@ -7131,7 +7166,7 @@ var caPlugin = new CA_ExtInterface();
 
         if (retCode !== 0) {
           _this2.$message.error(retMsg);
-          _this2.$emit('error');
+          _this2.$emit('error', { code: retCode, msg: retMsg });
           return;
         }
         //设置证书原文
@@ -7146,7 +7181,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);
@@ -7160,7 +7195,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;
@@ -7177,7 +7212,7 @@ var caPlugin = new CA_ExtInterface();
                   _this2.cerLogin();
                 } else {
                   _this2.$message.error(retMsg);
-                  _this2.$emit('error');
+                  _this2.$emit('error', { code: retCode, msg: retMsg });
                 }
                 return;
               }
@@ -7191,16 +7226,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() {
@@ -7237,7 +7272,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({
@@ -7253,7 +7288,7 @@ var caPlugin = new CA_ExtInterface();
                 _this3.cerLogin();
               } else {
                 _this3.$message.error(retMsg);
-                _this3.$emit('error');
+                _this3.$emit('error', { code: retCode, msg: retMsg });
               }
               return;
             }
@@ -7267,13 +7302,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 });
       });
     }
   }
@@ -7290,11 +7325,11 @@ var caPlugin = new CA_ExtInterface();
 
 var calogin_src_main_component = normalizeComponent(
   packages_calogin_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_3ba625d0_scoped_true_render,
-  mainvue_type_template_id_3ba625d0_scoped_true_staticRenderFns,
+  mainvue_type_template_id_4b7c35fc_scoped_true_render,
+  mainvue_type_template_id_4b7c35fc_scoped_true_staticRenderFns,
   false,
   null,
-  "3ba625d0",
+  "4b7c35fc",
   null
   
 )
@@ -26702,8 +26737,8 @@ form_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_form = (form_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=5f8259cf&
-var mainvue_type_template_id_5f8259cf_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=9a490c28&
+var mainvue_type_template_id_9a490c28_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -29259,11 +29294,11 @@ var mainvue_type_template_id_5f8259cf_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_5f8259cf_staticRenderFns = []
-mainvue_type_template_id_5f8259cf_render._withStripped = true
+var mainvue_type_template_id_9a490c28_staticRenderFns = []
+mainvue_type_template_id_9a490c28_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=5f8259cf&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=9a490c28&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/CommonOpinions.vue?vue&type=template&id=fdf49dec&
 var CommonOpinionsvue_type_template_id_fdf49dec_render = function () {
@@ -30881,8 +30916,8 @@ processFormvue_type_template_id_d7f4c800_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=d7f4c800&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/selectUser.vue?vue&type=template&id=1de54739&
-var selectUservue_type_template_id_1de54739_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/selectUser.vue?vue&type=template&id=12e8d2a9&
+var selectUservue_type_template_id_12e8d2a9_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -30999,6 +31034,7 @@ var selectUservue_type_template_id_1de54739_render = function () {
                       !_vm.isCustomUser ||
                       _vm.isCurrentNodeForbiddenChangeCandidate == 1,
                     filterable: Boolean(_vm.isCustomUser),
+                    where: _vm.newWhere,
                     multiple: _vm.newMultiple,
                     param: Object.assign({}, _vm.newParams, { info: "no" }),
                     disableds: _vm.disableds,
@@ -31025,11 +31061,11 @@ var selectUservue_type_template_id_1de54739_render = function () {
     2
   )
 }
-var selectUservue_type_template_id_1de54739_staticRenderFns = []
-selectUservue_type_template_id_1de54739_render._withStripped = true
+var selectUservue_type_template_id_12e8d2a9_staticRenderFns = []
+selectUservue_type_template_id_12e8d2a9_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/selectUser.vue?vue&type=template&id=1de54739&
+// CONCATENATED MODULE: ./packages/flow/src/selectUser.vue?vue&type=template&id=12e8d2a9&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/selectUser.vue?vue&type=script&lang=js&
 var selectUservue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -31124,6 +31160,7 @@ var selectUservue_type_script_lang_js_extends = Object.assign || function (targe
 //
 //
 //
+//
 
 
 
@@ -31232,6 +31269,11 @@ var selectUservue_type_script_lang_js_extends = Object.assign || function (targe
     };
   },
 
+  computed: {
+    newWhere: function newWhere() {
+      return selectUservue_type_script_lang_js_extends({ mid: JSON.parse(utils_util["a" /* default */].getStorage('mainConfig')).userModel.orgId + '-org-1' }, this.where);
+    }
+  },
   watch: {
     newPresetEdit: function newPresetEdit(val) {
       var _this = this;
@@ -31505,8 +31547,8 @@ var selectUservue_type_script_lang_js_extends = Object.assign || function (targe
 
 var selectUser_component = normalizeComponent(
   src_selectUservue_type_script_lang_js_,
-  selectUservue_type_template_id_1de54739_render,
-  selectUservue_type_template_id_1de54739_staticRenderFns,
+  selectUservue_type_template_id_12e8d2a9_render,
+  selectUservue_type_template_id_12e8d2a9_staticRenderFns,
   false,
   null,
   null,
@@ -46644,6 +46686,8 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
       if (val == 'taskReadAndEnd' || val == true && type != 'taskRead' || val == 'transfer') {
         this.flowSuccess(true);
         // this.$emit('success');
+      } else {
+        this.$emit('cancel');
       }
     },
 
@@ -47127,8 +47171,8 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 
 var flow_src_main_component = normalizeComponent(
   packages_flow_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_5f8259cf_render,
-  mainvue_type_template_id_5f8259cf_staticRenderFns,
+  mainvue_type_template_id_9a490c28_render,
+  mainvue_type_template_id_9a490c28_staticRenderFns,
   false,
   null,
   null,
@@ -53480,8 +53524,8 @@ layout_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_layout = (layout_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=950692f2&
-var mainvue_type_template_id_950692f2_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=729dd354&
+var mainvue_type_template_id_729dd354_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -54717,7 +54761,7 @@ var mainvue_type_template_id_950692f2_render = function () {
               },
               [
                 _c("p", { staticClass: "es-launch-text es-launch-user-name" }, [
-                  _vm._v(_vm._s(_vm.userName) + "，你好！"),
+                  _vm._v(_vm._s(_vm.userName) + "，您好！"),
                 ]),
                 _c(
                   "p",
@@ -54735,6 +54779,7 @@ var mainvue_type_template_id_950692f2_render = function () {
             ? _c("es-ca-login", {
                 ref: "calogin",
                 attrs: {
+                  "install-path": _vm.installPath,
                   "ca-model": _vm.caLoginModel,
                   identifyingId: _vm.identifyingId,
                   success: _vm.caLogin,
@@ -54747,7 +54792,7 @@ var mainvue_type_template_id_950692f2_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_950692f2_staticRenderFns = [
+var mainvue_type_template_id_729dd354_staticRenderFns = [
   function () {
     var _vm = this
     var _h = _vm.$createElement
@@ -54762,10 +54807,10 @@ var mainvue_type_template_id_950692f2_staticRenderFns = [
     ])
   },
 ]
-mainvue_type_template_id_950692f2_render._withStripped = true
+mainvue_type_template_id_729dd354_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=950692f2&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=729dd354&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=template&id=45dccfdc&
 var resetPasswordvue_type_template_id_45dccfdc_render = function () {
@@ -55854,6 +55899,7 @@ function login_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return fun
 //
 //
 //
+//
 
 
 
@@ -56094,7 +56140,8 @@ var ceshi = utils_util["a" /* default */].getParams('ceshi');
         return [];
       }
     },
-    caModel: String
+    caModel: String,
+    caInstallPath: String
   },
   computed: {
     transform: function transform() {
@@ -56348,7 +56395,8 @@ var ceshi = utils_util["a" /* default */].getParams('ceshi');
       launchKey: 'day',
       launchTime: 2000,
       switchActive: this.switchsActive,
-      loginDownloadApp: this.loginDownloadApps
+      loginDownloadApp: this.loginDownloadApps,
+      installPath: this.caInstallPath
     };
   },
   beforeCreate: function beforeCreate() {
@@ -56764,6 +56812,9 @@ var ceshi = utils_util["a" /* default */].getParams('ceshi');
         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;
@@ -57247,8 +57298,8 @@ var ceshi = utils_util["a" /* default */].getParams('ceshi');
 
 var login_src_main_component = normalizeComponent(
   packages_login_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_950692f2_render,
-  mainvue_type_template_id_950692f2_staticRenderFns,
+  mainvue_type_template_id_729dd354_render,
+  mainvue_type_template_id_729dd354_staticRenderFns,
   false,
   null,
   null,
@@ -90350,7 +90401,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.6.68',
+  version: '0.6.69',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/flow-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/flow-list.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/flow.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) {
@@ -4423,7 +4424,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 // 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/flow/src/main.vue?vue&type=template&id=5f8259cf&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=9a490c28&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -6984,7 +6985,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=5f8259cf&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=9a490c28&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -8615,8 +8616,8 @@ processFormvue_type_template_id_d7f4c800_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=d7f4c800&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/selectUser.vue?vue&type=template&id=1de54739&
-var selectUservue_type_template_id_1de54739_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/selectUser.vue?vue&type=template&id=12e8d2a9&
+var selectUservue_type_template_id_12e8d2a9_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -8733,6 +8734,7 @@ var selectUservue_type_template_id_1de54739_render = function () {
                       !_vm.isCustomUser ||
                       _vm.isCurrentNodeForbiddenChangeCandidate == 1,
                     filterable: Boolean(_vm.isCustomUser),
+                    where: _vm.newWhere,
                     multiple: _vm.newMultiple,
                     param: Object.assign({}, _vm.newParams, { info: "no" }),
                     disableds: _vm.disableds,
@@ -8759,11 +8761,11 @@ var selectUservue_type_template_id_1de54739_render = function () {
     2
   )
 }
-var selectUservue_type_template_id_1de54739_staticRenderFns = []
-selectUservue_type_template_id_1de54739_render._withStripped = true
+var selectUservue_type_template_id_12e8d2a9_staticRenderFns = []
+selectUservue_type_template_id_12e8d2a9_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/selectUser.vue?vue&type=template&id=1de54739&
+// CONCATENATED MODULE: ./packages/flow/src/selectUser.vue?vue&type=template&id=12e8d2a9&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/selectUser.vue?vue&type=script&lang=js&
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -8858,6 +8860,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 //
 //
 //
+//
 
 
 
@@ -8966,6 +8969,11 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     };
   },
 
+  computed: {
+    newWhere: function newWhere() {
+      return _extends({ mid: JSON.parse(util["a" /* default */].getStorage('mainConfig')).userModel.orgId + '-org-1' }, this.where);
+    }
+  },
   watch: {
     newPresetEdit: function newPresetEdit(val) {
       var _this = this;
@@ -9239,8 +9247,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
 var selectUser_component = Object(componentNormalizer["a" /* default */])(
   src_selectUservue_type_script_lang_js_,
-  selectUservue_type_template_id_1de54739_render,
-  selectUservue_type_template_id_1de54739_staticRenderFns,
+  selectUservue_type_template_id_12e8d2a9_render,
+  selectUservue_type_template_id_12e8d2a9_staticRenderFns,
   false,
   null,
   null,
@@ -24221,6 +24229,8 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       if (val == 'taskReadAndEnd' || val == true && type != 'taskRead' || val == 'transfer') {
         this.flowSuccess(true);
         // this.$emit('success');
+      } else {
+        this.$emit('cancel');
       }
     },
 

package/lib/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/handle-user.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/handler.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/icon.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) {