@zgfe/business-lib 1.0.28-adanalysis.0 → 1.0.28-dev.0

package/es/addToScene/index.js

@@ -97,7 +97,7 @@ var BizAddToScene = function BizAddToScene(props) {
         notification.success({
           message: '添加成功'
         });
-        if (props.onOk) props.onOk();
+        if (props.onOk) props.onOk(res);
       } else if (result.code === -10010) {
         notification.error({
           message: '添加失败',

package/es/addToScene/types.d.ts

@@ -1,7 +1,7 @@
 declare namespace AddToScene {
     interface Props {
         params: Record<string, any>;
-        onOk?: () => void;
+        onOk?: (data: any) => void;
         onCancel?: () => void;
     }
     interface Scene {

package/es/datePicker/datePicker.js

@@ -37,7 +37,7 @@ var BizDate = function BizDate(props) {
   useEffect(function () {
     var _props$dateCount;
 
-    if (((_props$dateCount = props.dateCount) === null || _props$dateCount === void 0 ? void 0 : _props$dateCount.count) == undefined) return;
+    if (!((_props$dateCount = props.dateCount) === null || _props$dateCount === void 0 ? void 0 : _props$dateCount.count)) return;
     var date = getDateRange(props.type, props.dateCount.count, !!includeToday);
     setDateRange(date);
     if (props.onChange) props.onChange(date, true);

package/es/datePicker/index.js

@@ -17,7 +17,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useEffect, useState } from 'react';
-import { getDateList } from './utils';
+import { dateList } from './utils';
 import BizSelect from '../select';
 import BizDate from './datePicker';
 import './styles/index.less';
@@ -25,8 +25,6 @@ import { Skeleton } from 'antd';
 export var classPrefix = 'biz-date-picker';
 
 var BizDatePicker = function BizDatePicker(props) {
-  var dateList = getDateList(props.mode || 'general');
-
   var _useState = useState(dateList[0]),
       _useState2 = _slicedToArray(_useState, 2),
       currentType = _useState2[0],
@@ -110,7 +108,7 @@ var BizDatePicker = function BizDatePicker(props) {
     paragraph: {
       rows: 1
     }
-  }, props.mode == 'general' ? /*#__PURE__*/React.createElement(BizSelect, {
+  }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-type"),
     value: currentType,
     labelField: "label",
@@ -118,7 +116,7 @@ var BizDatePicker = function BizDatePicker(props) {
     theme: "secondary",
     options: dateList,
     onChange: onChangeDateType
-  }) : '', /*#__PURE__*/React.createElement("div", {
+  }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-list")
   }, currentType.children.map(function (item, index) {
     return /*#__PURE__*/React.createElement("div", {
@@ -138,7 +136,6 @@ var BizDatePicker = function BizDatePicker(props) {
 };
 
 BizDatePicker.defaultProps = {
-  includeToday: true,
-  mode: 'general'
+  includeToday: true
 };
 export default BizDatePicker;

package/es/datePicker/styles/index.less

@@ -9,11 +9,10 @@
 
   &-list {
     display: flex;
-    margin: 0 16px 0 0;
+    margin: 0 16px;
   }
 
   .biz-select-handle {
-    margin-right: 16px;
     padding: 0;
   }
 

package/es/datePicker/types.d.ts

@@ -12,7 +12,6 @@ export declare namespace DatePickerTypes {
         value?: Value;
         includeToday?: boolean;
         onChange?: (data: Value) => void;
-        mode?: string;
     }
     interface Option {
         label: string;

package/es/datePicker/utils.d.ts

@@ -1,5 +1,5 @@
 import { DatePickerTypes } from './types';
-export declare function getDateList(mode: string): DatePickerTypes.Option[];
+export declare const dateList: DatePickerTypes.Option[];
 export declare const getDateRange: (type: 'hour' | 'day' | 'week' | 'month', count: number, includeToday: boolean) => {
     begin: string;
     end: string;

package/es/datePicker/utils.js

@@ -1,5 +1,5 @@
 import moment from 'moment';
-var dateListGeneral = [{
+export var dateList = [{
   label: '按小时',
   value: 'hour',
   children: [{
@@ -49,67 +49,8 @@ var dateListGeneral = [{
     count: 3
   }]
 }];
-var dateListSimple = [{
-  label: '按小时',
-  value: 'hour',
-  children: [{
-    value: '昨天',
-    count: 1
-  }, {
-    value: '前天',
-    count: 2
-  }]
-}, {
-  label: '按天',
-  value: 'day',
-  children: [{
-    value: '今天',
-    count: 0
-  }, {
-    value: '昨天',
-    count: 1
-  }, {
-    value: '7天',
-    count: 7
-  }, {
-    value: '14天',
-    count: 14
-  }, {
-    value: '30天',
-    count: 30
-  }]
-}, {
-  label: '按周',
-  value: 'week',
-  children: [{
-    value: '4周',
-    count: 4
-  }, {
-    value: '8周',
-    count: 8
-  }, {
-    value: '12周',
-    count: 12
-  }]
-}, {
-  label: '按月',
-  value: 'month',
-  children: [{
-    value: '1个月',
-    count: 1
-  }, {
-    value: '2个月',
-    count: 2
-  }, {
-    value: '3个月',
-    count: 3
-  }]
-}];
-export function getDateList(mode) {
-  return mode == 'general' ? dateListGeneral : dateListSimple;
-}
 export var getDateRange = function getDateRange(type, count, includeToday) {
-  var endDate = moment().subtract(includeToday || count == 0 ? 0 : 1, 'days').format('YYYY-MM-DD'),
+  var endDate = moment().subtract(includeToday ? 0 : 1, 'days').format('YYYY-MM-DD'),
       startDate = '';
 
   if (type === 'month') {
@@ -118,7 +59,6 @@ export var getDateRange = function getDateRange(type, count, includeToday) {
     startDate = moment().subtract(count, 'weeks').format('YYYY-MM-DD');
   } else if (type === 'day') {
     startDate = moment().subtract(count, 'days').format('YYYY-MM-DD');
-    if (count === 1) endDate = moment().subtract(count, 'days').format('YYYY-MM-DD');
   } else {
     startDate = endDate = moment().subtract(count, 'days').format('YYYY-MM-DD');
   }

package/es/layout/detail/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import './index.less';
 declare const BizDetailLayout: React.FC<{
-    width?: number;
+    width?: string;
     onBack?: () => void;
     extra?: React.ReactNode;
     children?: React.ReactNode;

package/es/layout/detail/index.js

@@ -8,7 +8,7 @@ var BizDetailLayout = function BizDetailLayout(props) {
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix,
     style: {
-      width: width ? "".concat(width, "px") : undefined
+      width: width
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-menu")

package/es/table/index.js

@@ -6,6 +6,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -23,7 +25,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 import { Table } from 'antd';
-import React, { useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import './styles/index.less';
 
 var BizTable = function BizTable(props) {
@@ -40,6 +42,14 @@ var BizTable = function BizTable(props) {
       scrollData = _useState2[0],
       setScrollData = _useState2[1];
 
+  var paginationObj = useMemo(function () {
+    if (_typeof(pagination) === 'object') {
+      return _objectSpread({}, pagination);
+    }
+
+    return {};
+  }, [pagination]);
+
   var onChangePage = function onChangePage(page, pageSize) {
     var count = page * pageSize;
     var totalCount = total || dataSource.length;
@@ -61,7 +71,7 @@ var BizTable = function BizTable(props) {
   return /*#__PURE__*/React.createElement(Table, _objectSpread(_objectSpread({}, res), {}, {
     columns: columns,
     dataSource: dataSource,
-    pagination: pagination && {
+    pagination: pagination && _objectSpread({
       className: 'biz-pagination',
       showSizeChanger: true,
       total: total || dataSource.length,
@@ -72,7 +82,7 @@ var BizTable = function BizTable(props) {
         }, totalNum), " \u6761");
       },
       onChange: onChangePage
-    },
+    }, paginationObj),
     scroll: scrollData
   }));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.28-adanalysis.0",
+  "version": "1.0.28-dev.0",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -58,5 +58,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "ef308ab7f9516e9575f31dac96706f225e1279df"
+  "gitHead": "a5a4dff196807db098e06d064cdbc8a4846bdccf"
 }

package/es/datePicker/demo/day.d.ts

@@ -1,3 +0,0 @@
-import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
-declare const _default: () => JSX.Element;
-export default _default;

package/es/datePicker/demo/day.js

@@ -1,48 +0,0 @@
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-import { BizDatePicker } from '@zgfe/business-lib';
-import React, { useState } from 'react';
-import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
-import { Divider, Switch } from 'antd';
-export default (function () {
-  var _useState = useState({
-    unit: 'day',
-    begin: '2022-05-03',
-    end: '2022-05-30',
-    relative: [0, 1]
-  }),
-      _useState2 = _slicedToArray(_useState, 2),
-      time = _useState2[0],
-      setTime = _useState2[1];
-
-  var _useState3 = useState(false),
-      _useState4 = _slicedToArray(_useState3, 2),
-      includeToday = _useState4[0],
-      setIncludeToday = _useState4[1];
-
-  var handleChange = function handleChange(data) {
-    setTime(function () {
-      return data;
-    });
-  };
-
-  return /*#__PURE__*/React.createElement("div", null, /*#__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(BizDatePicker, {
-    mode: "simple",
-    onChange: handleChange,
-    includeToday: includeToday,
-    defaultValue: time
-  }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u503C\uFF1A", JSON.stringify(time)));
-});