@zgfe/business-lib 1.2.56 → 1.2.57

package/es/assets/iconfont/iconfont.json

@@ -5,6 +5,55 @@
   "css_prefix_text": "",
   "description": "诸葛业务平台",
   "glyphs": [
+    {
+      "icon_id": "41736285",
+      "name": "更多",
+      "font_class": "gengduo",
+      "unicode": "e7d3",
+      "unicode_decimal": 59347
+    },
+    {
+      "icon_id": "41736270",
+      "name": "文件夹",
+      "font_class": "wenjianjia",
+      "unicode": "e7d4",
+      "unicode_decimal": 59348
+    },
+    {
+      "icon_id": "41736271",
+      "name": "拖拽",
+      "font_class": "tuozhuai",
+      "unicode": "e6b6",
+      "unicode_decimal": 59062
+    },
+    {
+      "icon_id": "41671151",
+      "name": "圈选",
+      "font_class": "quanxuan",
+      "unicode": "e7d0",
+      "unicode_decimal": 59344
+    },
+    {
+      "icon_id": "41671150",
+      "name": "上方添加",
+      "font_class": "shangfangtianjia",
+      "unicode": "e7d1",
+      "unicode_decimal": 59345
+    },
+    {
+      "icon_id": "41671149",
+      "name": "下方添加",
+      "font_class": "xiafangtianjia",
+      "unicode": "e7d2",
+      "unicode_decimal": 59346
+    },
+    {
+      "icon_id": "41671165",
+      "name": "版本",
+      "font_class": "chanpindiedai1",
+      "unicode": "e7cf",
+      "unicode_decimal": 59343
+    },
     {
       "icon_id": "41442688",
       "name": "quanping 1",
@@ -908,13 +957,6 @@
       "unicode": "e74a",
       "unicode_decimal": 59210
     },
-    {
-      "icon_id": "34602683",
-      "name": "菜单-更多",
-      "font_class": "caidan-gengduo",
-      "unicode": "e748",
-      "unicode_decimal": 59208
-    },
     {
       "icon_id": "34580051",
       "name": "菜单-设置",
@@ -1216,13 +1258,6 @@
       "unicode": "e6b5",
       "unicode_decimal": 59061
     },
-    {
-      "icon_id": "31393505",
-      "name": "拖拽",
-      "font_class": "tuozhuai",
-      "unicode": "e6b6",
-      "unicode_decimal": 59062
-    },
     {
       "icon_id": "31393091",
       "name": "更多操作",
@@ -1384,13 +1419,6 @@
       "unicode": "e795",
       "unicode_decimal": 59285
     },
-    {
-      "icon_id": "28132747",
-      "name": "更多操作",
-      "font_class": "gengduocaozuo",
-      "unicode": "e751",
-      "unicode_decimal": 59217
-    },
     {
       "icon_id": "28451770",
       "name": "导出",

package/es/datePickerV2/demo/index.js

@@ -4,7 +4,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { BizDatePickerOld } from '@zgfe/business-lib';
+import { BizDatePickerV2 } from '@zgfe/business-lib';
 import React, { useState } from 'react';
 import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
 import { Divider, Space, Switch } from 'antd';
@@ -55,7 +55,7 @@ export default (function () {
   }, /*#__PURE__*/React.createElement("div", null, "\u5305\u542B\u300C\u4ECA\u5929\u300D: ", /*#__PURE__*/React.createElement(Switch, {
     defaultChecked: includeToday,
     onChange: setIncludeToday
-  })), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(BizDatePickerOld, {
+  })), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(BizDatePickerV2, {
     includeToday: includeToday,
     value: time,
     defaultValue: time,

package/es/datePickerV2/popoverContent.js

@@ -34,10 +34,6 @@ export default (function (props) {
   }, props)), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-popoverContent-btns")
   }, /*#__PURE__*/React.createElement(Button, {
-    onClick: function onClick() {
-      return setOpen(false);
-    }
-  }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     onClick: function onClick() {
       if (ref.current) {

package/es/datePickerV2/styles/index.less

@@ -60,6 +60,10 @@
       border-radius: 0px @border-radius-small @border-radius-small 0px;
     }
 
+    &:not(:last-child) {
+      border-right: none;
+    }
+
     &:hover {
       .__default-hover();
       border-color: @border-color-base;
@@ -162,23 +166,29 @@
     & div:last-of-type {
       position: relative !important;
     }
-
+    .biz-date-picker-old-wrap-drop {
+      top: 0 !important;
+      margin-top: 12px;
+      padding: 0;
+    }
     .ant-picker-panel-container {
       background: #fff;
-      border: 1px solid var(--io-n-02, #fafafb);
+      border: 1px solid var(--io-n-02, #f2f3f4);
       border-radius: 10px;
       box-shadow: none;
     }
 
     .ant-picker-panel-container .ant-picker-panel-focused {
-      border-color: var(--io-n-02, #fafafb);
+      border-color: var(--io-n-02, #f2f3f4);
     }
   }
 
   &-popoverContent-btns {
+    position: absolute;
+    top: 0;
+    right: 0;
     display: flex;
     gap: 16px;
     justify-content: flex-end;
-    padding-top: 16px;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.2.56",
+  "version": "1.2.57",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -55,7 +55,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "6f8d6ca280b52aed4706f8a7394f6d712f984c1a",
+  "gitHead": "4fdc32d7c56bb2d3fea8c75f75b937434c89234f",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }