@teamias/rex-design 0.0.43 → 0.1.1

package/dist/components/base-form/components/ProFormDateRangePickerV2.js

@@ -188,8 +188,8 @@ export var ProFormDateRangePickerV2 = function ProFormDateRangePickerV2(_ref) {
             }, fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.style),
             value: startValue && endValue ? [dayjs(startValue), dayjs(endValue)] : undefined,
             onChange: function onChange(dates, dateStrings) {
-              form.setFieldValue(startFieldName, dateStrings[0] || undefined);
-              form.setFieldValue(endFieldName, dateStrings[1] || undefined);
+              form.setFieldValue(startFieldName, (dateStrings === null || dateStrings === void 0 ? void 0 : dateStrings[0]) || undefined);
+              form.setFieldValue(endFieldName, (dateStrings === null || dateStrings === void 0 ? void 0 : dateStrings[1]) || undefined);
               setTimeout(function () {
                 validateRules === null || validateRules === void 0 || validateRules[0].validator().catch(function () {});
               }, 0);

package/dist/components/base-form/core/descriptions-model.js

@@ -40,9 +40,7 @@ export var DescriptionsModel = function DescriptionsModel(_ref) {
       return false;
     };
     return (fields === null || fields === void 0 ? void 0 : fields.map(function (field) {
-      var _formItemProps$labelC;
-      var isRequired = hasRules(field);
-
+      var _formItemProps$requir, _formItemProps$labelC;
       // 创建新的field对象，移除label属性
       var label = field.label,
         tooltip = field.tooltip,
@@ -53,7 +51,7 @@ export var DescriptionsModel = function DescriptionsModel(_ref) {
         label: /*#__PURE__*/_jsx(Form.Item, {
           label: label,
           tooltip: tooltip,
-          required: isRequired,
+          required: (_formItemProps$requir = formItemProps.required) !== null && _formItemProps$requir !== void 0 ? _formItemProps$requir : hasRules(field),
           colon: false,
           style: {
             margin: 0

package/dist/components/base-form/demo/Base.js

@@ -35,9 +35,8 @@ export default (function () {
       }]
     }, {
       field: ['avg_cost_min', 'avg_cost_max'],
-      valueType: 'inputNumberRange',
+      valueType: 'inputNumberRangeV2'
       // "itemWidth": "150px",
-      fieldProps: []
     }],
     hidden: false
   }, {
@@ -91,7 +90,7 @@ export default (function () {
       }
     }
     // {
-    //   valueType: 'inputNumberRange',
+    //   valueType: 'inputNumberRangeV2',
     //   field: ['multipleComponents-min', 'multipleComponents-max'],
     //   defaultValue: [2, 5],
     // },
@@ -105,7 +104,7 @@ export default (function () {
     //   ],
     // },
     // {
-    //   valueType: 'dateRange',
+    //   valueType: 'dateRangeV2',
     //   field: ['multipleComponents-start', 'multipleComponents-end'],
     // },
     ]
@@ -138,8 +137,8 @@ export default (function () {
     }
   }, {
     valueType: 'dateRangeV2',
-    field: ['dateRange-start', 'dateRange-end'],
-    label: 'dateRange',
+    field: ['dateRangeV2-start', 'dateRangeV2-end'],
+    label: 'dateRangeV2',
     defaultValue: -29,
     required: true,
     fieldProps: {
@@ -205,9 +204,9 @@ export default (function () {
     label: 'inputNumber',
     defaultValue: 2
   }, {
-    valueType: 'inputNumberRange',
-    field: ['inputNumberRange-min', 'inputNumberRange-max'],
-    label: 'inputNumberRange',
+    valueType: 'inputNumberRangeV2',
+    field: ['inputNumberRangeV2-min', 'inputNumberRangeV2-max'],
+    label: 'inputNumberRangeV2',
     defaultValue: [2, 5]
   }, {
     valueType: 'textArea',

package/dist/components/base-form/demo/BaseFormCustomFormItem.js

@@ -34,6 +34,15 @@ export default (function () {
           label: '普通输入框',
           field: 'a',
           readonly: true
+        }, {
+          valueType: 'inputNumber',
+          label: '普通输入框',
+          field: 'a',
+          readonly: true,
+          formItemProps: {},
+          fieldProps: {
+            precision: 2
+          }
         }, {
           field: 'customFormItem',
           label: '自定义渲染表单项',

package/dist/components/base-form/demo/BaseFormDescriptions.js

@@ -99,7 +99,7 @@ export default (function () {
       }
     }
     // {
-    //   valueType: 'inputNumberRange',
+    //   valueType: 'inputNumberRangeV2',
     //   field: ['multipleComponents-min', 'multipleComponents-max'],
     //   defaultValue: [2, 5],
     // },
@@ -113,7 +113,7 @@ export default (function () {
     //   ],
     // },
     // {
-    //   valueType: 'dateRange',
+    //   valueType: 'dateRangeV2',
     //   field: ['multipleComponents-start', 'multipleComponents-end'],
     // },
     ],
@@ -151,8 +151,8 @@ export default (function () {
     }
   }, {
     valueType: 'dateRangeV2',
-    field: ['dateRange-start', 'dateRange-end'],
-    label: 'dateRange',
+    field: ['dateRangeV2-start', 'dateRangeV2-end'],
+    label: 'dateRangeV2',
     defaultValue: -29,
     required: true,
     fieldProps: {
@@ -213,9 +213,9 @@ export default (function () {
     label: 'inputNumber',
     defaultValue: 2
   }, {
-    valueType: 'inputNumberRange',
-    field: ['inputNumberRange-min', 'inputNumberRange-max'],
-    label: 'inputNumberRange',
+    valueType: 'inputNumberRangeV2',
+    field: ['inputNumberRangeV2-min', 'inputNumberRangeV2-max'],
+    label: 'inputNumberRangeV2',
     defaultValue: [2, 5]
   }, {
     valueType: 'textArea',
@@ -254,7 +254,7 @@ export default (function () {
     valueType: 'select',
     field: 'org_id',
     label: '部门',
-    itemWidth: '200px',
+    // itemWidth: '200px',
     options: [{
       label: '1',
       value: '1'
@@ -269,7 +269,7 @@ export default (function () {
     valueType: 'select',
     field: 'job_id',
     label: '岗位',
-    itemWidth: '200px',
+    // itemWidth: '200px',
     options: [{
       label: '1',
       value: '1'

package/dist/components/base-form/modules/renderComponentNode.js

@@ -385,9 +385,9 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
     if (valueType === 'selectDim') {
       var paramsProp = _objectSpread(_objectSpread(_objectSpread({}, values), item.params), item.defaultParams);
       // console.log(1111, params);
-
+      var keys = Array.isArray(splitKeyStr(keyStr)) ? splitKeyStr(keyStr) : [splitKeyStr(keyStr)];
       return /*#__PURE__*/_jsx(ProFormDependency, {
-        name: [keyStr],
+        name: keys,
         children: function children(dependData) {
           // console.log(2222, dependData);
 
@@ -399,7 +399,7 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
             },
             mode: item.multiple ? 'multiple' : 'single',
             params: paramsProp,
-            name: splitKeyStr(keyStr),
+            name: keys,
             initialValue: defaultValue,
             request: function () {
               var _request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {

package/dist/components/base-form/style/index.js

@@ -1,5 +1,5 @@
 import styled, { createGlobalStyle } from 'styled-components';
-var compactArr = ['ant-input-outlined', 'ant-select-selector', 'ant-picker', 'ant-input-number-outlined'];
+var compactArr = ['ant-input-outlined', 'ant-select', 'ant-select-selector', 'ant-picker', 'ant-input-number-outlined'];
 export var BaseFormStyle = createGlobalStyle([".base-form-field-group{display:flex !important;}.base-form-field-multiple-group{display:flex;width:100%;gap:8px;}.base-form-field-multiple-group.compact{gap:0;", "{border-top-left-radius:0;border-bottom-left-radius:0;border-left-color:transparent;}", "{border-top-right-radius:0;border-bottom-right-radius:0;}}.base-form-item{width:var(--item-width);.ant-form-item-label:has(label[title]){width:var(--label-width);}.ant-picker{width:100%;}.ant-space-compact{width:100%;}}"], compactArr.map(function (str) {
   return "> div:not(:first-child) .".concat(str);
 }).join(','), compactArr.map(function (str) {

package/dist/components/base-form/types/field-type.d.ts

@@ -1,6 +1,6 @@
 import { ProForm, ProFormCascader, ProFormCheckbox, ProFormDatePicker, ProFormDateRangePicker, ProFormDigit, ProFormDigitRange, ProFormItemRender, ProFormRadio, ProFormSelect, ProFormSwitch, ProFormText, ProFormTextArea, ProFormTreeSelect } from '@ant-design/pro-components';
 import { TButtonFilterItem } from "../../..";
-import { Form, GetProps } from 'antd';
+import { Form, GetProps, InputNumber } from 'antd';
 import { ReactNode } from 'react';
 import { ProFormDateRangePickerV2 } from '../components/ProFormDateRangePickerV2';
 import { ProFormDigitRangeV2 } from '../components/ProFormDigitRangeV2';
@@ -17,7 +17,10 @@ export type TTreeSelectProps = IBaseFormFieldItem<'treeSelect'> & Omit<GetProps<
 export type TCheckboxProps = IBaseFormFieldItem<'checkbox'> & Omit<GetProps<typeof ProFormCheckbox>, TOmitComponentItemType>;
 export type TCheckboxGroupProps = IBaseFormFieldItem<'checkboxGroup'> & Omit<GetProps<typeof ProFormCheckbox.Group>, TOmitComponentItemType>;
 export type TRadioGroupProps = IBaseFormFieldItem<'radioGroup'> & Omit<GetProps<typeof ProFormRadio>, TOmitComponentItemType>;
-export type TInputNumberProps = IBaseFormFieldItem<'inputNumber'> & Omit<GetProps<typeof ProFormDigit>, TOmitComponentItemType>;
+export type TInputNumberProps = IBaseFormFieldItem<'inputNumber'> & Omit<GetProps<typeof ProFormDigit>, TOmitComponentItemType> & {
+    formItemProps?: GetProps<typeof Form.Item>;
+    fieldProps?: GetProps<typeof InputNumber>;
+};
 export type TInputNumberRangeProps = IBaseFormFieldItem<'inputNumberRange'> & Omit<GetProps<typeof ProFormDigitRange>, TOmitComponentItemType>;
 export type TInputNumberRangeV2Props = IBaseFormFieldItem<'inputNumberRangeV2'> & Omit<GetProps<typeof ProFormDigitRangeV2>, TOmitComponentItemType>;
 export type TTextAreaProps = IBaseFormFieldItem<'textArea'> & Omit<GetProps<typeof ProFormTextArea>, TOmitComponentItemType>;

package/dist/components/base-table/components/BaseTableRow.js

@@ -12,9 +12,25 @@ import classNames from 'classnames';
 import React from 'react';
 import { DataCell } from "../../data-cell/data-cell";
 import { TableParentRow, TableParentRowCell } from "../style";
+
+/**
+ * 判断是否为左侧固定列
+ * 兼容 antd 5.x (fixLeft) 和 antd 6.x (fixStart)
+ */
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+var isFixedLeft = function isFixedLeft(props) {
+  return typeof (props === null || props === void 0 ? void 0 : props.fixLeft) === 'number' || typeof (props === null || props === void 0 ? void 0 : props.fixStart) === 'number';
+};
+
+/**
+ * 判断是否为右侧固定列
+ * 兼容 antd 5.x (fixRight) 和 antd 6.x (fixEnd)
+ */
+var isFixedRight = function isFixedRight(props) {
+  return typeof (props === null || props === void 0 ? void 0 : props.fixRight) === 'number' || typeof (props === null || props === void 0 ? void 0 : props.fixEnd) === 'number';
+};
 export var BaseTableRow = function BaseTableRow(outProps) {
   var cellClick = outProps['data-cell-click-event'],
     columnCount = outProps['data-column-count'],
@@ -33,11 +49,13 @@ export var BaseTableRow = function BaseTableRow(outProps) {
       // console.log(props);
       var record = props.children[0].props.record;
       var index = props.children[0].props.index;
+      // 兼容 antd 5.x (fixLeft) 和 antd 6.x (fixStart)
       var leftArr = props.children.filter(function (ii) {
-        return typeof ii.props.fixLeft === 'number';
+        return isFixedLeft(ii.props);
       });
+      // 兼容 antd 5.x (fixRight) 和 antd 6.x (fixEnd)
       var rightArr = props.children.filter(function (ii) {
-        return typeof ii.props.fixRight === 'number';
+        return isFixedRight(ii.props);
       });
       /** 是否存在左边固定列 */
       var hanBeforeColumns = leftArr.filter(function (ii) {
@@ -128,7 +146,9 @@ export var BaseTableRow = function BaseTableRow(outProps) {
               children: [_dom, _dom2]
             });
           }
-        }(), new Array(Math.max(+columnCount - 1, 0)).fill('').map(function (_, i) {
+        }(), Array.from({
+          length: Math.max(+columnCount - 1, 0)
+        }).map(function (_, i) {
           return /*#__PURE__*/_jsx("td", {
             "aria-hidden": "true"
           }, i);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamias/rex-design",
-  "version": "0.0.43",
+  "version": "0.1.1",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",
@@ -51,7 +51,7 @@
     "@ant-design/icons": "^6.0.0",
     "@ant-design/pro-components": "^2.8.10",
     "@ant-design/pro-form": "^2.32.0",
-    "@iconify/react": "^6.0.0",
+    "@iconify/react": "^6.0.2",
     "@js-preview/pdf": "^2.0.10",
     "@tiptap/core": "^2.12.0",
     "@tiptap/extension-bullet-list": "2.12.0",
@@ -68,14 +68,16 @@
     "@tiptap/pm": "^2.12.0",
     "@tiptap/react": "^2.12.0",
     "@tiptap/starter-kit": "^2.12.0",
-    "ahooks": "^3.9.0",
+    "ahooks": "^3.9.6",
     "antd": "^5.29.3",
     "classnames": "^2.5.1",
-    "dayjs": "^1.11.13",
+    "dayjs": "^1.11.19",
     "lodash": "^4.17.21",
     "prosemirror-state": "^1.4.3",
     "radash": "^12.1.1",
     "rc-virtual-list": "^3.19.1",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "react-intl": "^7.1.11",
     "react-quick-pinch-zoom": "^5.1.1",
     "react-router": "6",
@@ -88,19 +90,17 @@
     "@teamias/umi-loader-source-plugin": "^0.0.11",
     "@teamias/umi-plugin-upload-build": "^0.0.2",
     "@types/lodash": "^4.17.20",
-    "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
-    "@umijs/lint": "^4.0.0",
-    "dumi": "^2.4.13",
+    "@types/react": "^18.3.27",
+    "@types/react-dom": "^18.3.7",
+    "@umijs/lint": "^4.6.15",
+    "dumi": "^2.4.21",
     "eslint": "^8.23.0",
-    "father": "^4.1.0",
+    "father": "^4.6.12",
     "husky": "^8.0.1",
-    "lint-staged": "^13.0.3",
-    "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",
+    "lint-staged": "^13.3.0",
+    "prettier": "^3.7.4",
+    "prettier-plugin-organize-imports": "^4.3.0",
+    "prettier-plugin-packagejson": "^2.5.20",
     "stylelint": "^14.9.1"
   },
   "peerDependencies": {