@zhenliang/sheet 0.0.3 → 0.0.4

package/dist/core/table/index.js

@@ -1,5 +1,5 @@
 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); }
-var _excluded = ["columns", "dataSource", "rowKey", "rowSelection", "groupConfig", "onChange", "draggable", "eventHandler"];
+var _excluded = ["sheetInstance", "columns", "dataSource", "rowKey", "rowSelection", "groupConfig", "onChange", "handleAdd", "draggable", "eventHandler"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -18,6 +18,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 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 { Sheet } from "../..";
+import { Button } from 'antd';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { SheetEvent } from "../sheet/Event";
 import { DraggableShell } from "../shell/draggableShell";
@@ -30,12 +31,14 @@ import { useRowSelection } from "./useRowSelection";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var Table = function Table(_ref) {
-  var columns = _ref.columns,
+  var sheetRef = _ref.sheetInstance,
+    columns = _ref.columns,
     dataSource = _ref.dataSource,
     rowKey = _ref.rowKey,
     rowSelection = _ref.rowSelection,
     groupConfig = _ref.groupConfig,
     onChange = _ref.onChange,
+    handleAdd = _ref.handleAdd,
     draggable = _ref.draggable,
     eventHandler = _ref.eventHandler,
     args = _objectWithoutProperties(_ref, _excluded);
@@ -43,7 +46,8 @@ var Table = function Table(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     data = _useState2[0],
     setData = _useState2[1];
-  var sheetInstance = useRef(null);
+  var _sheetInstance = useRef(null);
+  var sheetInstance = sheetRef || _sheetInstance;
   var hasChildren = dataSource === null || dataSource === void 0 ? void 0 : dataSource.some(function (item) {
     var _item$children;
     return (item === null || item === void 0 ? void 0 : (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.length) > 0;
@@ -307,12 +311,20 @@ var Table = function Table(_ref) {
     }, "group-open-title")] : null, /*#__PURE__*/_jsx(SheetEvent, {
       name: "reverse",
       handler: handleReverse
-    }), Object.keys(eventHandler || {}).map(function (key) {
+    }, "_reverse"), Object.keys(eventHandler || {}).map(function (key) {
       return /*#__PURE__*/_jsx(SheetEvent, {
         name: key,
         handler: eventHandler === null || eventHandler === void 0 ? void 0 : eventHandler[key]
       }, key);
-    })]
+    }), handleAdd ? /*#__PURE__*/_jsx(Button, {
+      type: "dashed",
+      style: {
+        width: '100%',
+        height: 32
+      },
+      onClick: handleAdd,
+      children: "+ \u6DFB\u52A0"
+    }) : null]
   }));
 };
 export default Table;

package/dist/example/antComponent.js

@@ -15,7 +15,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { Modal } from 'antd';
-import React, { useState } from 'react';
+import { cloneDeep, random } from 'lodash';
+import React, { useCallback, useRef, useState } from 'react';
 import { DateEditor, getCascaderEditor, getNumberEditor, getSelectEditor } from "../core/editor";
 import Table from "../core/table";
 import { BtnViewer } from "../core/viewer/btnViewer";
@@ -176,34 +177,81 @@ var App = function App() {
     _useState2 = _slicedToArray(_useState, 2),
     state = _useState2[0],
     setState = _useState2[1];
+  var sheetInstance = useRef(null);
+  var handleChange = useCallback(function (changes) {
+    var newState = cloneDeep(state);
+    changes.forEach(function (change) {
+      var row = change.row,
+        key = change.key,
+        value = change.value;
+      newState[row][key] = value;
+    });
+    setState(newState);
+  }, [state]);
+  var handleAdd = useCallback(function () {
+    var _sheetInstance$curren;
+    var newState = cloneDeep(state);
+    (_sheetInstance$curren = sheetInstance.current) === null || _sheetInstance$curren === void 0 ? void 0 : _sheetInstance$curren.pushToHistory({
+      type: 'NewRow',
+      changes: [],
+      rowInfo: {
+        newRow: newState.length
+      }
+    });
+    setState([].concat(_toConsumableArray(newState), [{
+      key: String(random()),
+      name: 'new',
+      open: false,
+      date: '1990-01-01',
+      address2: "\u6253\u5F00\u5BF9\u8BDD\u68462".concat(newState.length + 2),
+      age: 40 + newState.length,
+      select: '111111',
+      address: 'London Park'
+    }]));
+  }, [state]);
   return /*#__PURE__*/_jsx(Table, {
+    sheetInstance: sheetInstance,
     columns: columns,
     dataSource: state,
     scroll: {
       x: '100%'
     },
-    onChange: function onChange() {},
+    onChange: handleChange,
+    handleAdd: handleAdd,
     eventHandler: {
-      'cell-edit': function cellEdit(value) {
+      reverse: function reverse(value) {
+        // 处理 行列删除自定义事件
         var _ref = value,
-          row = _ref.row,
-          cellValue = _ref.value;
+          type = _ref.type,
+          rowInfo = _ref.rowInfo;
+        if (type === 'Custom') {
+          console.log('操作');
+        } else if (type === 'NewRow') {
+          var newState = _toConsumableArray(state);
+          newState.splice(rowInfo === null || rowInfo === void 0 ? void 0 : rowInfo.newRow, 1);
+          setState(newState);
+        }
+      },
+      'cell-edit': function cellEdit(value) {
+        var _ref2 = value,
+          row = _ref2.row,
+          cellValue = _ref2.value;
         Modal.confirm({
           title: "".concat(row, " - ").concat(cellValue, "\u7F16\u8F91\u70B9\u4EC0\u4E48")
         });
       },
       'btn-click': function btnClick(value) {
-        var _ref2 = value,
-          row = _ref2.row,
-          type = _ref2.type;
+        var _ref3 = value,
+          row = _ref3.row,
+          type = _ref3.type;
         Modal.confirm({
           title: "".concat(row, " - ").concat(type, "\u63D0\u793A\u70B9\u4EC0\u4E48")
         });
       },
       'cell-switch': function cellSwitch(value) {
-        var _ref3 = value,
-          row = _ref3.row,
-          cellValue = _ref3.value;
+        var _ref4 = value,
+          row = _ref4.row,
+          cellValue = _ref4.value;
         var newState = _toConsumableArray(state);
         newState[row] = _objectSpread(_objectSpread({}, newState[row]), {}, {
           open: !cellValue

package/dist/example/valuationAnalyze.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => import("react/jsx-runtime").JSX.Element;
+export default _default;

package/dist/example/valuationAnalyze.js

@@ -0,0 +1,224 @@
+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 = 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 { getNumberEditor, getSelectEditor, Table } from "./..";
+import { useCallback, useState } from 'react';
+import { SwitchViewer } from "../core/viewer";
+import { jsx as _jsx } from "react/jsx-runtime";
+var RateValueInput = getNumberEditor({
+  addonAfter: '%',
+  min: 0,
+  max: 100
+});
+var ValueInput = getNumberEditor({
+  min: 0,
+  max: 100000000
+});
+var RateViewer = function RateViewer(props) {
+  var value = props.value;
+  return /*#__PURE__*/_jsx("span", {
+    children: value ? value + '%' : '-'
+  });
+};
+var data = [{
+  id: 2443,
+  draftId: '101601',
+  valuationType: 2,
+  termDiscountRate: null,
+  reversionDiscountRate: null,
+  vacancyDiscountRate: null,
+  discountRate: 8.5,
+  exitCapRate: 4.5,
+  gfaUnitPrice: 107350.31545913525,
+  nlaUnitPrice: 90130.38038659678,
+  totalValuation: 1622707368.4802885,
+  isEnabled: true
+}, {
+  id: 2444,
+  draftId: '101601',
+  valuationType: 5,
+  termDiscountRate: 4.5,
+  reversionDiscountRate: 5.5,
+  vacancyDiscountRate: 5.5,
+  discountRate: null,
+  exitCapRate: null,
+  gfaUnitPrice: 89327.04427210477,
+  nlaUnitPrice: 89327.04427210477,
+  totalValuation: 1429232708.3536763,
+  isEnabled: false
+}];
+export default (function () {
+  var evaluateMethods = [{
+    label: 'DCF',
+    value: 2
+  }, {
+    label: 'T&R',
+    value: 5
+  }];
+  var _useState = useState(data),
+    _useState2 = _slicedToArray(_useState, 1),
+    state = _useState2[0];
+  var columns = [{
+    title: '默认使用',
+    dataIndex: 'isEnabled',
+    width: 66,
+    // cellType: 'operate',
+    readonly: function readonly(value, record) {
+      return !!record.valuationType;
+    },
+    render: SwitchViewer
+    // component: (record: any, row: number, col: number) => (
+    //   <Switch
+    //     disabled={isNil(record.valuationType)}
+    //     checked={record.isEnabled}
+    //     onChange={handleSwitchChange(record, row)}
+    //   />
+    // ),
+  }, {
+    title: '评估方法',
+    dataIndex: 'valuationType',
+    width: 134,
+    readonly: function readonly(value, record, row) {
+      return !row;
+    },
+    render: function (props) {
+      var _evaluateMethods$find;
+      return /*#__PURE__*/_jsx("span", {
+        children: (_evaluateMethods$find = evaluateMethods.find(function (item) {
+          return item.value === props.value;
+        })) === null || _evaluateMethods$find === void 0 ? void 0 : _evaluateMethods$find.label
+      });
+    },
+    editor: getSelectEditor(evaluateMethods)
+    // calcReadOnly: (record, rowIndex) => !rowIndex,
+    // getSelectOptions: (record: any) => {
+    //   if (record.valuationType === 2) {
+    //     return evaluateMethods.slice(0, 1);
+    //   }
+    //   return evaluateMethods.slice(1);
+    // },
+  }, {
+    title: '租期内折现率',
+    dataIndex: 'termDiscountRate',
+    width: 134,
+    editor: RateValueInput,
+    viewer: RateViewer,
+    readonly: function readonly(value, record, row) {
+      return !row || isNil(record.valuationType);
+    }
+    // calcReadOnly: (record, rowIndex) => !rowIndex || isNil(record.valuationType),
+  }, {
+    title: '租期外折现率',
+    dataIndex: 'reversionDiscountRate',
+    width: 134,
+    viewer: RateViewer,
+    editor: RateValueInput,
+    readonly: function readonly(value, record, row) {
+      return !row || isNil(record.valuationType);
+    }
+  }, {
+    title: '空置面积折现率',
+    dataIndex: 'vacancyDiscountRate',
+    width: 134,
+    viewer: RateViewer,
+    editor: RateValueInput,
+    readonly: function readonly(value, record, row) {
+      return !row || isNil(record.valuationType);
+    }
+  }, {
+    title: '折现率',
+    dataIndex: 'discountRate',
+    width: 134,
+    viewer: RateViewer,
+    editor: RateValueInput,
+    readonly: function readonly(value, record, row) {
+      return !row || isNil(record.valuationType);
+    }
+  }, {
+    title: '退出资本化率',
+    dataIndex: 'exitCapRate',
+    width: 134,
+    viewer: RateViewer,
+    editor: RateValueInput,
+    readonly: function readonly(value, record, row) {
+      return !row || isNil(record.valuationType);
+    }
+  }, {
+    title: '估值单价/GFA',
+    dataIndex: 'gfaUnitPrice',
+    width: 134,
+    editor: ValueInput,
+    readonly: true
+  }, {
+    title: '估值单价/NLA',
+    dataIndex: 'nlaUnitPrice',
+    width: 134,
+    editor: ValueInput,
+    readonly: true
+  }, {
+    title: '估值',
+    dataIndex: 'totalValuation',
+    width: 134,
+    editor: ValueInput,
+    readonly: true
+  }, {
+    title: '操作',
+    width: 62,
+    dataIndex: 'id',
+    cellType: 'operate',
+    editable: false,
+    render: function (props) {
+      var row = props.row,
+        record = props.record;
+      if (row) {
+        return /*#__PURE__*/_jsx("div", {
+          children: /*#__PURE__*/_jsx(Button, {
+            type: "link",
+            onClick: function onClick() {
+              handleDelete(record.id);
+              // const infos = [{ id: record.id, row, extra: record }];
+              // operateCb && operateCb(4, { row, infos });
+            },
+
+            size: "small",
+            children: "\u5220\u9664"
+          })
+        });
+      }
+      return /*#__PURE__*/_jsx("div", {
+        className: "value-viewer number-value-viewer"
+      });
+    }
+
+    // component: (record: any, row: number, col: number, operateCb?: ExcelTableType.OperateCollector) => {
+    //   if (row) {
+    //     return (
+    //       <div>
+    //         <Button
+    //           type="link"
+    //           onClick={() => {
+    //             handleDelete(record.id);
+    //             const infos = [{ id: record.id, row, extra: record }];
+    //             operateCb && operateCb(4, { row, infos });
+    //           }}
+    //           size="small"
+    //         >
+    //           删除
+    //         </Button>
+    //       </div>
+    //     );
+    //   }
+    //   return <div className="value-viewer number-value-viewer" />;
+    // },
+  }];
+
+  var handleChange = useCallback(function () {}, [state]);
+  return /*#__PURE__*/_jsx(Table, {
+    columns: columns,
+    dataSource: state,
+    onChange: handleChange
+  });
+});

package/dist/type/sheetTable.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SheetType } from '.';
 export declare type refAssertion = {
     contains?: (target: EventTarget | null) => boolean;
@@ -31,6 +32,7 @@ export declare type TableGroupConfig = {
 };
 export declare type TableProps = {
     className?: string;
+    sheetInstance?: React.MutableRefObject<SheetType.SheetInstance | null>;
     columns: ColumnProps[];
     virtualized?: boolean;
     dataSource: Record<string, unknown>[];
@@ -51,5 +53,6 @@ export declare type TableProps = {
         onChange: (value: TableGroupConfig) => void;
     };
     onChange: (changes: TableChange[]) => void;
+    handleAdd?: () => void;
     eventHandler?: Record<'btn-click' | 'cell-edit' | 'cell-switch' | string, undefined | ((value: unknown) => void)>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhenliang/sheet",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",