eoss-ui 0.6.67 → 0.6.69

package/lib/input-number.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/input.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/login.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) {
@@ -4316,7 +4317,7 @@ var nightImg = 'data:image/jpeg;base64,/9j/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBA
 // 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/login/src/main.vue?vue&type=template&id=68c9ba89&
+// 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 render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4486,35 +4487,38 @@ var render = function () {
                             : [
                                 _vm._l(_vm.icons, function (item) {
                                   return [
-                                    _c(
-                                      "div",
-                                      {
-                                        directives: [
+                                    _vm.modelLength == 2
+                                      ? _c(
+                                          "div",
                                           {
-                                            name: "show",
-                                            rawName: "v-show",
-                                            value:
-                                              _vm.modelLength == 2 &&
-                                              _vm.active != item.type &&
-                                              _vm.modelTips,
-                                            expression:
-                                              "modelLength == 2 && active != item.type && modelTips",
+                                            directives: [
+                                              {
+                                                name: "show",
+                                                rawName: "v-show",
+                                                value:
+                                                  _vm.active != item.type &&
+                                                  _vm.modelTips,
+                                                expression:
+                                                  "active != item.type && modelTips",
+                                              },
+                                            ],
+                                            key: item.type,
+                                            staticClass:
+                                              "es-login-model-item-tips",
                                           },
-                                        ],
-                                        key: item.type,
-                                        staticClass: "es-login-model-item-tips",
-                                      },
-                                      [
-                                        _vm._v(
-                                          "\n              " +
-                                            _vm._s(item.name) +
-                                            "点这里"
-                                        ),
-                                        _c("i", {
-                                          staticClass: "es-icon-zhixiangyou",
-                                        }),
-                                      ]
-                                    ),
+                                          [
+                                            _vm._v(
+                                              "\n              " +
+                                                _vm._s(item.name) +
+                                                "点这里"
+                                            ),
+                                            _c("i", {
+                                              staticClass:
+                                                "es-icon-zhixiangyou",
+                                            }),
+                                          ]
+                                        )
+                                      : _vm._e(),
                                     _c(
                                       "span",
                                       {
@@ -4613,7 +4617,7 @@ var render = function () {
                                 : [
                                     _vm._l(_vm.icons, function (item) {
                                       return [
-                                        item.type !== "3" && item.type !== "1"
+                                        item.type !== "3"
                                           ? _c(
                                               "div",
                                               {
@@ -5550,7 +5554,7 @@ var 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",
@@ -5568,9 +5572,12 @@ var render = function () {
             ? _c("es-ca-login", {
                 ref: "calogin",
                 attrs: {
+                  "install-path": _vm.installPath,
+                  "ca-model": _vm.caLoginModel,
                   identifyingId: _vm.identifyingId,
                   success: _vm.caLogin,
                 },
+                on: { error: _vm.handleError },
               })
             : _vm._e(),
         ],
@@ -5596,7 +5603,7 @@ var staticRenderFns = [
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=68c9ba89&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=729dd354&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -6704,6 +6711,10 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
+//
+//
+//
+//
 
 
 
@@ -6943,7 +6954,9 @@ var ceshi = util["a" /* default */].getParams('ceshi');
       default: function _default() {
         return [];
       }
-    }
+    },
+    caModel: String,
+    caInstallPath: String
   },
   computed: {
     transform: function transform() {
@@ -7041,6 +7054,7 @@ var ceshi = util["a" /* default */].getParams('ceshi');
       types.forEach(function (item) {
         icon.push(_this.iconfonts[item]);
       });
+      console.log(icon);
       return icon;
     },
     isCaLogin: function isCaLogin() {
@@ -7131,6 +7145,7 @@ var ceshi = util["a" /* default */].getParams('ceshi');
       loginTitleImg: this.loginTitle,
       loginLogoImg: this.loginLogo,
       loginModel: this.type,
+      caLoginModel: this.caModel,
       passModifyModel: null,
       active: 0,
       submit: false,
@@ -7195,7 +7210,8 @@ var ceshi = util["a" /* default */].getParams('ceshi');
       launchKey: 'day',
       launchTime: 2000,
       switchActive: this.switchsActive,
-      loginDownloadApp: this.loginDownloadApps
+      loginDownloadApp: this.loginDownloadApps,
+      installPath: this.caInstallPath
     };
   },
   beforeCreate: function beforeCreate() {
@@ -7206,8 +7222,8 @@ var ceshi = util["a" /* default */].getParams('ceshi');
   },
   created: function created() {
     this.launchKey = 5 < new Date().getHours() < 18 ? 'day' : 'night';
-    if (ceshi == 'true' || ceshi == true) {
-      this.loginModel = '0';
+    if (ceshi) {
+      this.loginModel = ceshi == 'true' || ceshi == true ? '0' : ceshi;
     }
     if (this.isScale || util["a" /* default */].getParams('scale')) {
       util["a" /* default */].setScale();
@@ -7401,6 +7417,7 @@ var ceshi = util["a" /* default */].getParams('ceshi');
           _this4.$refs[ref] && _this4.$refs[ref].clearValidate();
         });
       } else {
+        this.submit = true;
         this.$refs.calogin && this.$refs.calogin.getCertificate();
       }
       this.countdown = 0;
@@ -7522,15 +7539,19 @@ var ceshi = util["a" /* default */].getParams('ceshi');
         document.title = res.subsystemName;
       }
       this.app = res.appName || res.subsystemName;
-      if (res.loginModel && ceshi !== 'true' && ceshi !== true) {
+      if (res.loginModel && !ceshi) {
         this.loginModel = (res.firstLoginModel || this.firstLoginModel) && !isLogined ? res.firstLoginModel || this.firstLoginModel : res.loginModel;
       }
+
       if (res.loginBackgroundUrl) {
         this.loginBackgroundImg = res.loginBackgroundUrl.split(',');
       }
       if (res.loginLogoUrl) {
         this.loginLogoImg = res.loginLogoUrl;
       }
+      if (res.caModel) {
+        this.caLoginModel = res.caModel;
+      }
       res.loginPage && sessionStorage.setItem('loginPage', res.loginPage);
       if (res.subsystemExtend && Object.keys(res.subsystemExtend).length) {
         if (res.subsystemExtend.copyright && res.subsystemExtend.copyright.length) {
@@ -7550,6 +7571,9 @@ var ceshi = util["a" /* default */].getParams('ceshi');
         if (res.subsystemExtend.loginModel && (ceshi == 'true' || ceshi == true)) {
           this.loginModel = (res.firstLoginModel || this.firstLoginModel) && !isLogined ? res.firstLoginModel || this.firstLoginModel : res.subsystemExtend.loginModel;
         }
+        if (res.subsystemExtend.caModel) {
+          this.caLoginModel = res.subsystemExtend.caModel;
+        }
         if (res.subsystemExtend.applicationName) {
           localStorage.setItem('appcode', res.subsystemExtend.applicationName);
         }
@@ -7603,6 +7627,9 @@ var ceshi = 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;
@@ -7803,7 +7830,7 @@ var ceshi = util["a" /* default */].getParams('ceshi');
       util["a" /* default */].ajax({
         method: 'post',
         url: this.caAction,
-        data: { identifyingId: this.identifyingId, signedData: signedData }
+        data: typeof signedData === 'string' ? { identifyingId: this.identifyingId, signedData: signedData } : signedData
       }).then(function (res) {
         _this10.submit = false;
         if (res.rCode == 0) {
@@ -7826,6 +7853,7 @@ var ceshi = util["a" /* default */].getParams('ceshi');
           _this10.onError(res);
         }
       }).catch(function (err) {
+        _this10.submit = false;
         if (err.message && err.message !== 'canceled') {
           _this10.$message.error(err.message);
         }
@@ -8062,6 +8090,9 @@ var ceshi = util["a" /* default */].getParams('ceshi');
     },
     handlePaste: function handlePaste(event) {
       this.safe && event.preventDefault();
+    },
+    handleError: function handleError() {
+      this.submit = false;
     }
   },
   beforeDestroy: function beforeDestroy() {