@sooloer/pages 0.1.22 → 1.0.0

package/dist/button-group/index.js

@@ -1,6 +1,6 @@
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 import { EllipsisOutlined } from '@ant-design/icons';
-import { Button, ConfigProvider, Dropdown, Menu, Space } from 'antd';
+import { Button, ConfigProvider, Dropdown, Space } from 'antd';
 import React, { useContext, useMemo } from 'react';
 import Style from "./style";
 var ProButton = function ProButton(props) {
@@ -25,29 +25,33 @@ var ProButton = function ProButton(props) {
     }, [buttons]),
     fixedSource = _useMemo.fixedSource,
     moreSource = _useMemo.moreSource;
+  var moreMenuItems = useMemo(function () {
+    return moreSource.map(function (button) {
+      var _ref, _key, _button$buttonProps, _button$buttonProps2, _button$render;
+      return {
+        key: String((_ref = (_key = (_button$buttonProps = button.buttonProps) === null || _button$buttonProps === void 0 ? void 0 : _button$buttonProps.key) !== null && _key !== void 0 ? _key : (_button$buttonProps2 = button.buttonProps) === null || _button$buttonProps2 === void 0 ? void 0 : _button$buttonProps2.id) !== null && _ref !== void 0 ? _ref : button === null || button === void 0 ? void 0 : button.text),
+        label: (_button$render = button.render) !== null && _button$render !== void 0 ? _button$render : /*#__PURE__*/React.createElement(Button, _extends({}, button.buttonProps, {
+          type: "link"
+        }), button === null || button === void 0 ? void 0 : button.text)
+      };
+    });
+  }, [moreSource]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Style, {
     prefix: context.getPrefixCls()
   }), /*#__PURE__*/React.createElement("div", {
     className: "sooloer-button-group"
   }, /*#__PURE__*/React.createElement(Space, {
     size: 8
-  }, fixedSource.map(function (button, index) {
-    var _button$render;
-    return (_button$render = button.render) !== null && _button$render !== void 0 ? _button$render : /*#__PURE__*/React.createElement(Button, _extends({
-      key: index,
+  }, fixedSource.map(function (button) {
+    var _button$render2, _ref2, _key2, _button$buttonProps3, _button$buttonProps4;
+    return (_button$render2 = button.render) !== null && _button$render2 !== void 0 ? _button$render2 : /*#__PURE__*/React.createElement(Button, _extends({
+      key: String((_ref2 = (_key2 = (_button$buttonProps3 = button.buttonProps) === null || _button$buttonProps3 === void 0 ? void 0 : _button$buttonProps3.key) !== null && _key2 !== void 0 ? _key2 : (_button$buttonProps4 = button.buttonProps) === null || _button$buttonProps4 === void 0 ? void 0 : _button$buttonProps4.id) !== null && _ref2 !== void 0 ? _ref2 : button === null || button === void 0 ? void 0 : button.text),
       type: type || 'default'
     }, button.buttonProps), button === null || button === void 0 ? void 0 : button.text);
   }), moreSource.length > 0 && /*#__PURE__*/React.createElement(Dropdown, {
-    overlay: /*#__PURE__*/React.createElement(Menu, null, moreSource.map(function (button, index) {
-      var _button$render2;
-      return /*#__PURE__*/React.createElement(Menu.Item, {
-        key: index
-      }, (_button$render2 = button.render) !== null && _button$render2 !== void 0 ? _button$render2 : /*#__PURE__*/React.createElement(Button, _extends({
-        key: index
-      }, button.buttonProps, {
-        type: "link"
-      }), button === null || button === void 0 ? void 0 : button.text));
-    })),
+    menu: {
+      items: moreMenuItems
+    },
     placement: "bottom",
     overlayClassName: "sooloer-button-group__dropdown"
   }, /*#__PURE__*/React.createElement(Button, {

package/dist/page/demo/basic.js

@@ -19,6 +19,55 @@ import { ConfigProvider } from 'antd';
 import zhCN from 'antd/lib/locale/zh_CN';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { columns, fetchData, total } from "./data";
+var GRADE_SOURCE = [{
+  label: '小学',
+  options: [{
+    label: '一年级',
+    value: '1-1'
+  }, {
+    label: '二年级',
+    value: '1-2'
+  }, {
+    label: '三年级',
+    value: '1-3'
+  }, {
+    label: '四年级',
+    value: '1-4'
+  }, {
+    label: '五年级',
+    value: '1-5'
+  }, {
+    label: '六年级',
+    value: '1-6'
+  }]
+}, {
+  label: '初中',
+  options: [{
+    label: '五四制六年级',
+    value: '2-0'
+  }, {
+    label: '七年级',
+    value: '2-1'
+  }, {
+    label: '八年级',
+    value: '2-2'
+  }, {
+    label: '九年级',
+    value: '2-3'
+  }]
+}, {
+  label: '高中',
+  options: [{
+    label: '高一',
+    value: '3-1'
+  }, {
+    label: '高二',
+    value: '3-2'
+  }, {
+    label: '高三',
+    value: '3-3'
+  }]
+}];
 var initialValues = {
   invoiceNo: '001',
   invoiceCode: '002'
@@ -45,6 +94,14 @@ var fields = [{
       value: 's'
     }]
   }
+}, {
+  label: '年级',
+  name: 'grad',
+  type: 'select',
+  widgetProps: {
+    allowClear: true,
+    options: GRADE_SOURCE
+  }
 }];
 var tabs = [{
   key: '1',

package/dist/tab/demo/settingRef.js

@@ -7,20 +7,32 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { SettingOutlined } from '@ant-design/icons';
 import { ProTabs } from "../..";
 import React, { useEffect, useRef, useState } from 'react';
-import { render } from 'react-dom';
+import { createRoot } from 'react-dom/client';
 export default (function () {
   var _useState = useState('1'),
     _useState2 = _slicedToArray(_useState, 2),
     activeKey = _useState2[0],
     setActiveKey = _useState2[1];
   var nodeRef = useRef(null);
-  var handleChange = function handleChange(activeKey) {
-    console.log(activeKey);
-    setActiveKey(activeKey);
+  var iconRootRef = useRef(null);
+  var handleChange = function handleChange(key) {
+    console.log(key);
+    setActiveKey(key);
   };
   useEffect(function () {
-    render( /*#__PURE__*/React.createElement(SettingOutlined, null), nodeRef === null || nodeRef === void 0 ? void 0 : nodeRef.current);
-  }, [nodeRef]);
+    if (!nodeRef.current) {
+      return;
+    }
+    if (!iconRootRef.current) {
+      iconRootRef.current = createRoot(nodeRef.current);
+    }
+    iconRootRef.current.render( /*#__PURE__*/React.createElement(SettingOutlined, null));
+    return function () {
+      var _iconRootRef$current;
+      (_iconRootRef$current = iconRootRef.current) === null || _iconRootRef$current === void 0 || _iconRootRef$current.unmount();
+      iconRootRef.current = null;
+    };
+  }, []);
   var buttonSource = [{
     buttonProps: {
       onClick: function onClick() {

package/dist/table/demo/checkbox.js

@@ -59,6 +59,7 @@ export default (function () {
     height: 420,
     rowSelection: {
       fixed: true,
+      columnWidth: 120,
       selectedRowKeys: selectedRowKeys,
       // @ts-ignore
       onChange: handleRowSelectionChange

package/dist/table/index.js

@@ -143,8 +143,9 @@ var ProTable = function ProTable(_ref) {
         otherProps.fixed = expandable ? false : otherProps.fixed;
       }
       return {
-        rowSelection: _objectSpread(_objectSpread({}, otherProps), {}, {
-          columnWidth: 40,
+        rowSelection: _objectSpread(_objectSpread({
+          columnWidth: 40
+        }, otherProps), {}, {
           onSelect: handleSelect,
           selectedRowKeys: _toConsumableArray(keys),
           onSelectAll: handleSelectAll,

package/dist/table/table/index.js

@@ -22,8 +22,8 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { sum } from '@tmaito/utils';
 import { Checkbox, Col, ConfigProvider, Row, Table } from 'antd';
 import classnames from 'classnames';
-import React, { useContext, useEffect, useLayoutEffect, useMemo, useState } from 'react';
-import { render } from 'react-dom';
+import React, { useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
+import { createRoot } from 'react-dom/client';
 import Setting from "../setting";
 import Style from "./style";
 var ElTable = function ElTable(_ref) {
@@ -63,6 +63,8 @@ var ElTable = function ElTable(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     tableHeaderHeight = _useState8[0],
     setTableHeaderHeight = _useState8[1];
+  var settingRootRef = useRef(null);
+  var settingContainerRef = useRef(null);
   var _useContext = useContext(ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
   useEffect(function () {
@@ -119,30 +121,50 @@ var ElTable = function ElTable(_ref) {
 
   // table config 初始化挂载
   useLayoutEffect(function () {
-    if (setting) {
-      var getContainer = setting.getContainer,
-        _args = _objectWithoutProperties(setting, _excluded2);
-      var prefixCls = getPrefixCls();
-      var node = typeof getContainer === 'string' ? document.querySelector(getContainer) : getContainer;
-      if (getContainer) {
-        render(
-        /*#__PURE__*/
-        // @ts-ignore
-        React.createElement(Setting, _extends({}, _args, {
-          size: size,
-          loading: typeof loading === 'boolean' ? loading : loading === null || loading === void 0 ? void 0 : loading.spinning,
-          prefixCls: prefixCls,
-          columns: sortColumns,
-          onReload: function onReload() {
-            var _setting$onReload;
-            return setting === null || setting === void 0 || (_setting$onReload = setting.onReload) === null || _setting$onReload === void 0 ? void 0 : _setting$onReload.call(setting);
-          },
-          onSizeChange: setSize,
-          onColumnSortChange: handleColumnSortChange
-        })), node);
-      }
+    if (!setting) {
+      return;
     }
+    var getContainer = setting.getContainer,
+      settingArgs = _objectWithoutProperties(setting, _excluded2);
+    if (!getContainer) {
+      return;
+    }
+    var node = typeof getContainer === 'string' ? document.querySelector(getContainer) : getContainer;
+    if (!node || !(node instanceof Element) && !(node instanceof DocumentFragment)) {
+      return;
+    }
+    var prefixCls = getPrefixCls();
+    if (!settingRootRef.current || settingContainerRef.current !== node) {
+      var _settingRootRef$curre;
+      (_settingRootRef$curre = settingRootRef.current) === null || _settingRootRef$curre === void 0 || _settingRootRef$curre.unmount();
+      settingRootRef.current = createRoot(node);
+      settingContainerRef.current = node;
+    }
+    settingRootRef.current.render(
+    /*#__PURE__*/
+    // @ts-ignore
+    React.createElement(Setting, _extends({}, settingArgs, {
+      size: size,
+      loading: typeof loading === 'boolean' ? loading : loading === null || loading === void 0 ? void 0 : loading.spinning,
+      prefixCls: prefixCls,
+      columns: sortColumns,
+      onReload: function onReload() {
+        var _setting$onReload;
+        return setting === null || setting === void 0 || (_setting$onReload = setting.onReload) === null || _setting$onReload === void 0 ? void 0 : _setting$onReload.call(setting);
+      },
+      onSizeChange: setSize,
+      onColumnSortChange: handleColumnSortChange
+    })));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [size, sortColumns, setting, getPrefixCls]);
+  useEffect(function () {
+    return function () {
+      var _settingRootRef$curre2;
+      (_settingRootRef$curre2 = settingRootRef.current) === null || _settingRootRef$curre2 === void 0 || _settingRootRef$curre2.unmount();
+      settingRootRef.current = null;
+      settingContainerRef.current = null;
+    };
+  }, []);
 
   // scroll 滚动
   var resetScrollProps = function resetScrollProps() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sooloer/pages",
-  "version": "0.1.22",
+  "version": "1.0.0",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",
@@ -47,7 +47,7 @@
     "@ant-design/cssinjs": "^1.18.4",
     "@ant-design/icons": "^5.3.0",
     "@tmaito/utils": "^0.4.14",
-    "antd": "^5.14.2",
+    "antd": "^6.3.1",
     "dayjs": "^1.11.10",
     "mockjs": "^1.1.0",
     "react-sortable-hoc": "^2.0.0",
@@ -62,7 +62,7 @@
     "@types/react-dom": "^18.0.0",
     "@umijs/fabric": "^4.0.1",
     "@umijs/lint": "^4.0.0",
-    "dumi": "^2.2.13",
+    "dumi": "^2.4.23",
     "eslint": "^8.23.0",
     "father": "^4.1.0",
     "husky": "^8.0.1",
@@ -70,8 +70,8 @@
     "prettier": "^2.7.1",
     "prettier-plugin-organize-imports": "^3.0.0",
     "prettier-plugin-packagejson": "^2.2.18",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
+    "react": "^19.1.0",
+    "react-dom": "^19.1.0",
     "stylelint": "^14.9.1"
   },
   "peerDependencies": {