eoss-ui 0.5.81-beta8 → 0.5.82

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

@@ -1,7 +1,7 @@
 @import './common/var.scss';
 .es-tabs {
   &:not(.el-tabs--card):not(.el-tabs--border-card):not(.el-tabs--left) {
-    .el-tabs__nav-wrap {
+    .el-tabs__nav-wrap:not(.is-scrollable) {
       padding: 5px 8px 0 8px;
       .is-top {
         .el-tabs__item {
@@ -26,36 +26,32 @@
     }
   }
   &.el-tabs--border-card {
-    .el-tabs__header {
+    & > .el-tabs__header {
       height: 44px;
       border-bottom: $--border-base;
-    }
-    .el-tabs__nav-scroll {
-      padding: 9px 10px 0 10px;
-      .el-tabs__item {
-        height: 36px;
-        line-height: 36px;
-        .el-badge {
-          position: absolute;
-          right: 0;
-          top: 0;
-          line-height: 0;
-          .el-badge__content {
-            display: block;
-            line-height: 16px;
-            font-weight: 200;
-            width: 16px;
-            height: 16px;
-            padding: 0;
-            border: 0;
+      .el-tabs__nav-scroll {
+        padding: 9px 10px 0 10px;
+        .el-tabs__item {
+          height: 36px;
+          line-height: 36px;
+          .el-badge {
+            .el-badge__content {
+              display: block;
+              line-height: 16px;
+              font-weight: 200;
+              width: 16px;
+              height: 16px;
+              padding: 0;
+              border: 0;
+            }
+          }
+          &.is-active {
+            border-top-color: #d9d9d9;
+            border-top-left-radius: 2px;
+            border-top-right-radius: 2px;
+            font-weight: bold;
+            color: $--color-primary;
           }
-        }
-        &.is-active {
-          border-top-color: #d9d9d9;
-          border-top-left-radius: 2px;
-          border-top-right-radius: 2px;
-          font-weight: bold;
-          color: $--color-primary;
         }
       }
     }

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

@@ -12,12 +12,23 @@
       .el-button {
         padding: 4px 8px;
         & + .el-button,
-        & + .es-button-badge {
+        & + .es-button-badge,
+        & + .es-upload,
+        & + .el-dropdown,
+        & + .es-selector {
           margin-left: 6px;
         }
       }
-      .es-button-badge + .el-button {
-        margin-left: 6px;
+      .es-button-badge,
+      .es-upload,
+      .es-selector {
+        & + .el-button,
+        & + .es-button-badge,
+        & + .es-upload,
+        & + .el-dropdown,
+        & + .es-selector {
+          margin-left: 6px;
+        }
       }
     }
     .es-form {
@@ -108,7 +119,8 @@
     }
   }
   .es-form-search-small {
-    .el-form-item__content {
+    .el-form-item__content,
+    .el-input-number {
       line-height: 32px !important;
     }
     .el-form-item__label {

package/packages/theme-chalk/src/tree-group.scss

@@ -54,6 +54,14 @@ $--tree-offset-base: 240px;
           height: 100%;
         }
       }
+      &.es-tabs-tree-card-plus {
+        .el-tabs__nav-wrap {
+          padding-top: 14px;
+        }
+        .el-tabs__content {
+          top: 50px;
+        }
+      }
     }
   }
   .es-tree-group-right {

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

@@ -7,6 +7,7 @@
   position: relative;
   .es-tree-title,
   .es-tree-search {
+    line-height: 32px;
     padding: 6px 8px;
     background-color: #f5f7fa;
     border-bottom: $--border-base;
@@ -29,11 +30,6 @@
       }
     }
   }
-  .es-tree-title {
-    line-height: 34px;
-    padding: 6px 8px 4px 8px;
-    min-height: 45px;
-  }
   .el-input-group__append {
     border: 0;
     background-color: $--color-primary;
@@ -79,7 +75,7 @@
     }
   }
   .es-filter-tree {
-    padding-top: 4px;
+    padding-top: 8px;
     padding-left: 8px;
     .el-tree-node__expand-icon {
       &::before {
@@ -149,4 +145,21 @@
       }
     }
   }
+  &.es-tree-plus {
+    .es-tree-title,
+    .es-tree-search {
+      background-color: #fff;
+      border-bottom-color: transparent;
+    }
+    .es-tree-search:first-child {
+      padding: 16px 8px 8px 8px;
+    }
+  }
+  &.es-tabs-tree-plus {
+    .es-tree-search {
+      padding-top: 12px;
+      background-color: #fff;
+      border-bottom-color: transparent;
+    }
+  }
 }

package/packages/tree-group/src/main.vue

@@ -12,6 +12,9 @@
         v-model="active"
         type="card"
         class="es-tabs-tree-card"
+        :class="{
+          'es-tabs-tree-card-plus': mode == 'plus'
+        }"
         @tab-click="handleSelect"
       >
         <el-tab-pane
@@ -23,6 +26,9 @@
           <es-tree
             v-bind="item.tree"
             :ref="item.ref ? item.ref : 'groupTree' + index"
+            :class="{
+              'es-tabs-tree-plus': mode == 'plus'
+            }"
             @node-click="
               (data, node) => {
                 handleNodeClick(data, node, item);
@@ -69,6 +75,9 @@
         v-else
         v-bind="tree"
         ref="groupTree"
+        :class="{
+          'es-tree-plus': mode == 'plus'
+        }"
         @node-click="handleNodeClick"
         @check-change="handleCheckChange"
         @results="handleResults"
@@ -104,16 +113,10 @@
           v-on="{ ...$listeners, ...form.events }"
         >
         </es-form>
-        <!-- <es-tabs
-        v-else-if="tabs"
-        v-bind="tabs"
-        :ref="tabs.ref ? tabs.ref : 'esTabs'"
-        v-on="{ ...$listeners, ...tabs.events }"
-      >
-      </es-tabs> -->
         <es-data-table
           v-else-if="table"
           size="mini"
+          :mode="mode"
           v-bind="
             handleExclAttribute({
               data: { close: true, ...table },
@@ -187,10 +190,16 @@
 
 <script>
 import util from 'eoss-ui/src/utils/util';
+const dataTableMode =
+  util.win.top.dataTableMode || util.win.dataTableMode || 'default';
 export default {
   name: 'EsTreeGroup',
   inheritAttrs: false,
   props: {
+    mode: {
+      type: String,
+      default: dataTableMode
+    },
     host: {
       type: String,
       default: ''

package/src/config/api.js

@@ -25,6 +25,9 @@ export const codeRetrialAuth = '/sso2/retrialAuth/codeRetrialAuth';// 二级身
 export const doAssistanceQrLogin = '/sso2/signIn/auth/doAssistanceQrLogin';// 二级身份验证-验证码验证
 
 // 框架
+export const userOnline = 'sys/v1/mecpSys/userOnlineListJson.dhtml';// 在线人数列表
+export const getUserAppWithTag = '/sysv3/sysUucApp/getUserAppWithTag';// 获取应用
+export const recordUserApp = '/sysv3/sysUucApp/recordUserApp';// 记录应用点击率
 export const mainConfig = '/main2/main/mainConfig'; // 获取主页面配置
 export const initUserSet = '/main2/main/initUserSet'; // 获取用户信息
 export const updateUserInfo = '/main2/main/updateUserInfo'; // 更新用户信息
@@ -36,7 +39,6 @@ export const getApplicationIdArray = '/main2/main/getApplicationIdArray'; // 获
 export const getComplexApplications = '/main2/menu/getComplexApplications'; // 获取当前用户菜单; 含页签菜单格式的数据
 export const getComplexApplicationsNew =
   '/main2/menu/getComplexApplicationsNew'; // 获取当前用户应用菜单; 含页签菜单格式的数据
-export const getUserAppWithTag = '/sysv3/sysUucApp/getUserAppWithTag';// 获取应用
 export const getUserCustomInfo = '/main2/main/getUserCustomInfo'; // 获取主题样式
 export const updateUserCustomInfo = '/main2/main/updateUserCustomInfo'; // 更新主题样式
 // 框架 - 系统消息

package/src/index.js

@@ -1,112 +1,112 @@
 /* Automatically generated by './build/bin/build-entry.js' */
 
-import Button from '../packages/button/index.js';
-import ButtonGroup from '../packages/button-group/index.js';
-import Calendar from '../packages/calendar/index.js';
-import Card from '../packages/card/index.js';
-import Cascader from '../packages/cascader/index.js';
-import CheckboxGroup from '../packages/checkbox-group/index.js';
-import Clients from '../packages/clients/index.js';
-import DataTable from '../packages/data-table/index.js';
-import DataTableForm from '../packages/data-table-form/index.js';
-import DatePicker from '../packages/date-picker/index.js';
-import Dialog from '../packages/dialog/index.js';
-import Enterprise from '../packages/enterprise/index.js';
-import ErrorPage from '../packages/error-page/index.js';
-import Form from '../packages/form/index.js';
-import Flow from '../packages/flow/index.js';
-import FlowGroup from '../packages/flow-group/index.js';
-import FlowList from '../packages/flow-list/index.js';
-import HandleUser from '../packages/handle-user/index.js';
-import Handler from '../packages/handler/index.js';
-import Icon from '../packages/icon/index.js';
-import Icons from '../packages/icons/index.js';
-import Input from '../packages/input/index.js';
-import InputNumber from '../packages/input-number/index.js';
-import Label from '../packages/label/index.js';
-import Layout from '../packages/layout/index.js';
-import Login from '../packages/login/index.js';
-import Main from '../packages/main/index.js';
-import Menu from '../packages/menu/index.js';
-import Nav from '../packages/nav/index.js';
-import Notify from '../packages/notify/index.js';
-import Pagination from '../packages/pagination/index.js';
-import Page from '../packages/page/index.js';
-import Player from '../packages/player/index.js';
-import QrCode from '../packages/qr-code/index.js';
-import RadioGroup from '../packages/radio-group/index.js';
-import RetrialAuth from '../packages/retrial-auth/index.js';
-import Select from '../packages/select/index.js';
-import SelectGanged from '../packages/select-ganged/index.js';
-import Selector from '../packages/selector/index.js';
-import SelectorPanel from '../packages/selector-panel/index.js';
-import Sizer from '../packages/sizer/index.js';
-import Steps from '../packages/steps/index.js';
-import Switch from '../packages/switch/index.js';
-import Tabs from '../packages/tabs/index.js';
-import TabsPanel from '../packages/tabs-panel/index.js';
-import Tips from '../packages/tips/index.js';
-import Tree from '../packages/tree/index.js';
-import TreeGroup from '../packages/tree-group/index.js';
-import Toolbar from '../packages/toolbar/index.js';
-import TableForm from '../packages/table-form/index.js';
-import Upload from '../packages/upload/index.js';
-import Wujie from '../packages/wujie/index.js';
+import Button from '../packages/button/index.js';
+import ButtonGroup from '../packages/button-group/index.js';
+import Calendar from '../packages/calendar/index.js';
+import Card from '../packages/card/index.js';
+import Cascader from '../packages/cascader/index.js';
+import CheckboxGroup from '../packages/checkbox-group/index.js';
+import Clients from '../packages/clients/index.js';
+import DataTable from '../packages/data-table/index.js';
+import DataTableForm from '../packages/data-table-form/index.js';
+import DatePicker from '../packages/date-picker/index.js';
+import Dialog from '../packages/dialog/index.js';
+import Enterprise from '../packages/enterprise/index.js';
+import ErrorPage from '../packages/error-page/index.js';
+import Form from '../packages/form/index.js';
+import Flow from '../packages/flow/index.js';
+import FlowGroup from '../packages/flow-group/index.js';
+import FlowList from '../packages/flow-list/index.js';
+import HandleUser from '../packages/handle-user/index.js';
+import Handler from '../packages/handler/index.js';
+import Icon from '../packages/icon/index.js';
+import Icons from '../packages/icons/index.js';
+import Input from '../packages/input/index.js';
+import InputNumber from '../packages/input-number/index.js';
+import Label from '../packages/label/index.js';
+import Layout from '../packages/layout/index.js';
+import Login from '../packages/login/index.js';
+import Main from '../packages/main/index.js';
+import Menu from '../packages/menu/index.js';
+import Nav from '../packages/nav/index.js';
+import Notify from '../packages/notify/index.js';
+import Pagination from '../packages/pagination/index.js';
+import Page from '../packages/page/index.js';
+import Player from '../packages/player/index.js';
+import QrCode from '../packages/qr-code/index.js';
+import RadioGroup from '../packages/radio-group/index.js';
+import RetrialAuth from '../packages/retrial-auth/index.js';
+import Select from '../packages/select/index.js';
+import SelectGanged from '../packages/select-ganged/index.js';
+import Selector from '../packages/selector/index.js';
+import SelectorPanel from '../packages/selector-panel/index.js';
+import Sizer from '../packages/sizer/index.js';
+import Steps from '../packages/steps/index.js';
+import Switch from '../packages/switch/index.js';
+import Tabs from '../packages/tabs/index.js';
+import TabsPanel from '../packages/tabs-panel/index.js';
+import Tips from '../packages/tips/index.js';
+import Tree from '../packages/tree/index.js';
+import TreeGroup from '../packages/tree-group/index.js';
+import Toolbar from '../packages/toolbar/index.js';
+import TableForm from '../packages/table-form/index.js';
+import Upload from '../packages/upload/index.js';
+import Wujie from '../packages/wujie/index.js';
 import Wxlogin from '../packages/wxlogin/index.js';
 
 const components = [
-  Button,
-  ButtonGroup,
-  Calendar,
-  Card,
-  Cascader,
-  CheckboxGroup,
-  Clients,
-  DataTable,
-  DataTableForm,
-  DatePicker,
-  Dialog,
-  Enterprise,
-  ErrorPage,
-  Form,
-  Flow,
-  FlowGroup,
-  FlowList,
-  HandleUser,
-  Handler,
-  Icon,
-  Icons,
-  Input,
-  InputNumber,
-  Label,
-  Layout,
-  Login,
-  Main,
-  Menu,
-  Nav,
-  Notify,
-  Pagination,
-  Page,
-  Player,
-  QrCode,
-  RadioGroup,
-  RetrialAuth,
-  Select,
-  SelectGanged,
-  Selector,
-  SelectorPanel,
-  Sizer,
-  Steps,
-  Switch,
-  Tabs,
-  TabsPanel,
-  Tips,
-  Tree,
-  TreeGroup,
-  Toolbar,
-  TableForm,
-  Upload,
-  Wujie,
+  Button,
+  ButtonGroup,
+  Calendar,
+  Card,
+  Cascader,
+  CheckboxGroup,
+  Clients,
+  DataTable,
+  DataTableForm,
+  DatePicker,
+  Dialog,
+  Enterprise,
+  ErrorPage,
+  Form,
+  Flow,
+  FlowGroup,
+  FlowList,
+  HandleUser,
+  Handler,
+  Icon,
+  Icons,
+  Input,
+  InputNumber,
+  Label,
+  Layout,
+  Login,
+  Main,
+  Menu,
+  Nav,
+  Notify,
+  Pagination,
+  Page,
+  Player,
+  QrCode,
+  RadioGroup,
+  RetrialAuth,
+  Select,
+  SelectGanged,
+  Selector,
+  SelectorPanel,
+  Sizer,
+  Steps,
+  Switch,
+  Tabs,
+  TabsPanel,
+  Tips,
+  Tree,
+  TreeGroup,
+  Toolbar,
+  TableForm,
+  Upload,
+  Wujie,
   Wxlogin
 ];
 
@@ -121,59 +121,59 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.5.81-beta8',
+  version: '0.5.82',
   install,
-  Button,
-  ButtonGroup,
-  Calendar,
-  Card,
-  Cascader,
-  CheckboxGroup,
-  Clients,
-  DataTable,
-  DataTableForm,
-  DatePicker,
-  Dialog,
-  Enterprise,
-  ErrorPage,
-  Form,
-  Flow,
-  FlowGroup,
-  FlowList,
-  HandleUser,
-  Handler,
-  Icon,
-  Icons,
-  Input,
-  InputNumber,
-  Label,
-  Layout,
-  Login,
-  Main,
-  Menu,
-  Nav,
-  Notify,
-  Pagination,
-  Page,
-  Player,
-  QrCode,
-  RadioGroup,
-  RetrialAuth,
-  Select,
-  SelectGanged,
-  Selector,
-  SelectorPanel,
-  Sizer,
-  Steps,
-  Switch,
-  Tabs,
-  TabsPanel,
-  Tips,
-  Tree,
-  TreeGroup,
-  Toolbar,
-  TableForm,
-  Upload,
-  Wujie,
+  Button,
+  ButtonGroup,
+  Calendar,
+  Card,
+  Cascader,
+  CheckboxGroup,
+  Clients,
+  DataTable,
+  DataTableForm,
+  DatePicker,
+  Dialog,
+  Enterprise,
+  ErrorPage,
+  Form,
+  Flow,
+  FlowGroup,
+  FlowList,
+  HandleUser,
+  Handler,
+  Icon,
+  Icons,
+  Input,
+  InputNumber,
+  Label,
+  Layout,
+  Login,
+  Main,
+  Menu,
+  Nav,
+  Notify,
+  Pagination,
+  Page,
+  Player,
+  QrCode,
+  RadioGroup,
+  RetrialAuth,
+  Select,
+  SelectGanged,
+  Selector,
+  SelectorPanel,
+  Sizer,
+  Steps,
+  Switch,
+  Tabs,
+  TabsPanel,
+  Tips,
+  Tree,
+  TreeGroup,
+  Toolbar,
+  TableForm,
+  Upload,
+  Wujie,
   Wxlogin
 };

package/src/utils/util.js

@@ -47,6 +47,7 @@ import { MessageBox, Loading } from 'eoss-element';
  * @param {String} [publicKey] - sm2加密公钥
  * @param {Array} [secret] - 要加密的字段属性名称，默认所有
  * @param {Array} [encodes] - 需要对参数值进行encodeURIComponent编码的参数值名称
+ * @param {Array} [oldmode] - 老接口转新数据结构
  **/
 // 请求
 // const pendingRequest = new Map();
@@ -73,7 +74,8 @@ const ajax = function ({
   loading,
   publicKey,
   secret,
-  encodes = ['cd']
+  encodes,
+  oldmode
 }) {
   let header = headers || {};
   if (!method) {
@@ -433,6 +435,9 @@ const ajax = function ({
       header['content-type'] = 'application/json;charset=UTF-8';
     }
   }
+  if (oldmode && !header['api-response-mode']) {
+    header['api-response-mode'] = true;
+  }
   return http({
     method,
     url,