eoss-ui 0.6.34 → 0.6.36

package/packages/theme-chalk/src/common/var.scss

@@ -219,7 +219,7 @@ $--color-primary-light-2: getColor($--color-primary, 2) !default; /* 66b1ff */
 $--color-primary-light-3: getColor($--color-primary, 3) !default; /* 79bbff */
 $--color-primary-light-4: getColor($--color-primary, 4) !default; /* 8cc5ff */
 $--color-primary-light-5: getColor($--color-primary, 5) !default; /* a0cfff */
-$--color-primary-light-6: $--color-primary !default; /* a0cfff */
+$--color-primary: $--color-primary !default; /* a0cfff */
 $--color-primary-light-7: getColor($--color-primary, 7) !default; /* b3d8ff */
 $--color-primary-light-8: getColor($--color-primary, 8) !default; /* c6e2ff */
 $--color-primary-light-9: getColor($--color-primary, 9) !default; /* d9ecff */
@@ -885,7 +885,7 @@ $--primary-button-colors: (
   $--color-primary-light-3,
   $--color-primary-light-4,
   $--color-primary-light-5,
-  $--color-primary-light-6,
+  $--color-primary,
   $--color-primary-light-7,
   $--color-primary-light-8,
   $--color-primary-light-9,

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

@@ -72,7 +72,7 @@
   }
 }
 .es-popper-sub-system {
-  background-color: $--color-primary-light-6 !important;
+  background-color: $--color-primary !important;
   color: #ffff;
   min-width: unset;
   &.is-width {

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

@@ -15,6 +15,13 @@
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
+.es-icon-tingzhi:before {
+  content: '\e800';
+}
+
+.es-icon-zhengfangti:before {
+  content: '\e609';
+}
 
 .es-icon-zhanghaodenglu:before {
   content: '\e781';

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

@@ -594,7 +594,7 @@
           margin-left: 12px;
         }
         &.es-icon-active {
-          color: $--color-primary-light-6;
+          color: $--color-primary;
         }
       }
       .es-icon {

package/packages/theme-chalk/src/retrial-auth.scss

@@ -31,7 +31,7 @@
         margin-left: 12px;
       }
       &.es-active {
-        color: $--color-primary-light-6;
+        color: $--color-primary;
       }
     }
   }

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.6.34',
+  version: '0.6.36',
   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

@@ -76,7 +76,8 @@ const ajax = function ({
   publicKey,
   secret,
   encodes,
-  oldmode
+  oldmode,
+  ...configs
 }) {
   let header = headers || {};
   if (!method) {
@@ -476,7 +477,8 @@ const ajax = function ({
     url,
     data,
     params,
-    headers: header
+    headers: header,
+    ...configs
   });
 };
 
@@ -1186,37 +1188,47 @@ const extend = function () {
  * @param {String} [fmt] - 格式
  **/
 const formatDate = function (date, fmt) {
-  let obj;
-  if (date) {
-    obj = new Date(date);
-  } else {
-    obj = new Date();
-  }
-  let quarter = ['一', '二', '三', '四'];
-  let o = {
-    'b+': Math.ceil((obj.getMonth() + 1) / 6), // 半年
-    'M+': obj.getMonth() + 1, // 月份
-    'd+': obj.getDate(), // 日
-    'H+': obj.getHours(), // 小时
-    'm+': obj.getMinutes(), // 分
-    's+': obj.getSeconds(), // 秒
-    'q+': quarter[Math.ceil((obj.getMonth() + 1) / 3) - 1], // 季度
-    S: obj.getMilliseconds() // 毫秒
+  // 1. 处理日期输入
+  const obj = date ? new Date(date) : new Date();
+  if (isNaN(obj.getTime())) throw new Error('Invalid date input');
+
+  // 2. 工具函数
+  const pad = n => String(n).padStart(2, '0');
+  const monthNum = obj.getMonth(); // 数值月份 (0-11)
+
+  // 3. 定义格式化规则
+  const quarter = ['一', '二', '三', '四'];
+  const halfyear = ['上', '下'];
+  const o = {
+    'b+': halfyear[Math.floor(monthNum / 6)], // 1=上半年, 2=下半年
+    'M+': monthNum + 1, // 月份 (1-12)
+    'd+': obj.getDate(), // 日 (1-31)
+    'H+': obj.getHours(), // 小时 (0-23)
+    'm+': obj.getMinutes(), // 分钟 (0-59)
+    's+': obj.getSeconds(), // 秒 (0-59)
+    'q+': quarter[Math.floor(monthNum / 3)], // 季度 (一~四)
+    'S': obj.getMilliseconds() // 毫秒 (0-999)
   };
+
+  // 4. 处理年份
   if (/(y+)/.test(fmt)) {
     fmt = fmt.replace(
       RegExp.$1,
-      (obj.getFullYear() + '').substr(4 - RegExp.$1.length)
+      String(obj.getFullYear()).slice(-RegExp.$1.length)
     );
   }
-  for (let k in o) {
-    if (new RegExp('(' + k + ')').test(fmt)) {
+
+  // 5. 处理其他字段
+  for (const k in o) {
+    if (new RegExp(`(${k})`).test(fmt)) {
+      const val = k === 'q+' ? o[k] : pad(o[k]); // 季度不补零
       fmt = fmt.replace(
         RegExp.$1,
-        RegExp.$1.length === 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length)
+        RegExp.$1.length === 1 ? o[k] : val
       );
     }
   }
+
   return fmt;
 };