eoss-ui 0.5.33 → 0.5.35

package/packages/theme-chalk/src/handler.scss

@@ -65,8 +65,10 @@
 .es-popper-sub-system {
   background-color: $--color-primary-light-6 !important;
   color: #ffff;
-  max-width: 346px;
   min-width: unset;
+  &.is-width {
+    width: 346px;
+  }
   .popper__arrow {
     &::after {
       border-bottom-color: $--color-primary-light-7 !important;

package/packages/toolbar/src/main.vue

@@ -149,24 +149,25 @@ export default {
     let filter = [];
 
     this.contents.forEach((items) => {
-      if (items.type === 'text') {
+      let { config, type, reset, multiCondition, contents, ...other } = items;
+      if (type === 'text') {
         text = [
           h(
             'div',
             { class: 'es-toolbar-text' },
-            Array.isArray(items.contents)
-              ? items.contents.map((item) => {
+            Array.isArray(contents)
+              ? contents.map((item) => {
                   return h('span', { class: 'es-text' }, [
                     h('span', { class: 'es-info-label' }, [`${item.label}：`]),
                     h('span', { class: 'es-info-value' }, [item.value])
                   ]);
                 })
-              : items.contents
+              : contents
           )
         ];
       }
-      if (items.type === 'button') {
-        items.contents.forEach((item) => {
+      if (type === 'button') {
+        contents.forEach((item) => {
           if (!item.hide && (item.upload || (item.code && item.ownId))) {
             buttons.push(
               h('es-upload', {
@@ -201,7 +202,7 @@ export default {
           }
         });
       }
-      if (items.type === 'tabs') {
+      if (type === 'tabs') {
         buttons = buttons.concat([
           h(
             'el-menu',
@@ -209,18 +210,18 @@ export default {
               props: {
                 defaultActive: this.active
                   ? this.active
-                  : items.contents[0].name
-                  ? items.contents[0].name
+                  : contents[0].name
+                  ? contents[0].name
                   : '0',
                 mode: 'horizontal'
               },
               on: {
                 select: (res) => {
-                  this.handleSelect(items.contents[parseInt(res, 10)], res);
+                  this.handleSelect(contents[parseInt(res, 10)], res);
                 }
               }
             },
-            items.contents.map((item, index) => {
+            contents.map((item, index) => {
               return h(
                 'el-menu-item',
                 {
@@ -234,8 +235,7 @@ export default {
           )
         ]);
       }
-      let { config, ...other } = items;
-      if (items.type === 'search') {
+      if (type === 'search') {
         let itemClass = {
           radio: 'es-toolbar-item-radio',
           checkbox: 'es-toolbar-item-checkbox',
@@ -254,18 +254,18 @@ export default {
               labelWidth: this.labelWidth,
               closeDialog: false,
               model: this.searchData,
-              contents: items.contents,
+              contents: contents,
               itemClass: itemClass,
               inline: true,
               search: true,
-              isReset: items.reset,
+              isReset: reset,
               showButton: this.showFormBtn,
               ...other,
               ...(config || {})
             },
             on: {
               submit: (data) => {
-                this.hanleSearch(data, items.multiCondition);
+                this.hanleSearch(data, multiCondition);
               },
               reset: this.hanleReset,
               change: this.handleChange
@@ -273,12 +273,12 @@ export default {
           })
         ];
       }
-      if (items.type === 'info') {
+      if (type === 'info') {
         info = [
           h(
             'div',
             { class: 'es-toolbar-info' },
-            items.contents.map((item) => {
+            contents.map((item) => {
               return h('span', { class: 'es-info' }, [
                 h('span', { class: 'es-info-label' }, [`${item.label}：`]),
                 h('span', { class: 'es-info-value' }, [item.value])
@@ -287,7 +287,7 @@ export default {
           )
         ];
       }
-      if (items.type === 'filter') {
+      if (type === 'filter') {
         info.push(
           h(
             'el-button',
@@ -340,7 +340,7 @@ export default {
                       size: 'medium',
                       closeDialog: false,
                       model: this.advancedData,
-                      contents: items.contents
+                      contents: contents
                     },
                     on: {
                       submit: this.hanleSubmit,

package/src/config/api.js

@@ -22,6 +22,8 @@ export const initRetrialAuth = '/sso2/retrialAuth/initRetrialAuth'; // 初始化
 export const getRetrialAuthCode = '/sso2/retrialAuth/getRetrialAuthCode'; // 获取二级身份验证验证码
 export const scanCodeRetrialAuth = '/sso2/retrialAuth/scanCodeRetrialAuth';// 二维码扫码验证(二级权限验证)
 export const codeRetrialAuth = '/sso2/retrialAuth/codeRetrialAuth';// 二级身份验证-验证码验证
+export const doAssistanceQrLogin = '/sso2/signIn/auth/doAssistanceQrLogin';// 二级身份验证-验证码验证
+
 // 框架
 export const mainConfig = '/main2/main/mainConfig'; // 获取主页面配置
 export const initUserSet = '/main2/main/initUserSet'; // 获取用户信息

package/src/index.js

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

package/src/utils/util.js

@@ -7,7 +7,7 @@
 
 /* eslint-disable indent */
 const sm2 = require('sm-crypto').sm2;
-import { authCenter } from '../config/api';
+import { authCenter, mainConfig } from '../config/api';
 import axios from 'axios';
 import qs from 'qs';
 import JSONbig from 'json-bigint';
@@ -1206,6 +1206,7 @@ const getLength = function (text) {
  * @desc:转换明度
  * @author huangbo
  * @date 2022年5月7日
+ * @return {string,array} 元素类名或者id
  **/
 const getLightness = function ($v, $i, $isLight) {
   let $value = $isLight
@@ -1215,6 +1216,24 @@ const getLightness = function ($v, $i, $isLight) {
   return toFixed($value, 2);
 };
 
+/**
+ * getMainConfig
+ * @desc 获取系统配置
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {function} callback - 回调函数
+ **/
+const getMainConfig = function (callback) {
+  ajax({ url: mainConfig })
+    .then((res) => {
+      if (res && res.rCode === 0) {
+        callback(res.results);
+      }
+    })
+    .catch(() => {
+    });
+};
+
 /**
  * getMinute
  * @desc 获取分钟
@@ -1857,7 +1876,7 @@ const indexOfObj = function (arry, target, key) {
  * @date 2022年5月7日
  * @param {Object} [obj] -
  **/
-const isExist = function(obj) {
+const isExist = function (obj) {
   return obj !== undefined && obj !== null && obj !== '';
 };
 
@@ -2868,6 +2887,7 @@ export default {
   getHour,
   getWeekNumber,
   getLength,
+  getMainConfig,
   getMinute,
   getMonth,
   getObjectType,