@teamias/rex-design 0.0.36 → 0.0.37

package/dist/components/base-descriptions/base-descriptions.js

@@ -41,6 +41,7 @@ export var BaseDescriptions = function BaseDescriptions(_ref) {
           padding: '12px'
         }
       }, styles),
+      column: column,
       items: items === null || items === void 0 ? void 0 : items.map(function (item, index) {
         try {
           var _item$children;

package/dist/components/base-form/core/{base-form.d.ts → core.d.ts}

@@ -1,3 +1,3 @@
 import { FC } from 'react';
 import { IBaseFormProps } from '../types';
-export declare const BaseForm: FC<IBaseFormProps>;
+export declare const Core: FC<IBaseFormProps>;

package/dist/components/base-form/core/{base-form.js → core.js}

@@ -19,7 +19,7 @@ import { BaseFormStyle } from "../style";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-export var BaseForm = function BaseForm(props) {
+export var Core = function Core(props) {
   var rawAllProps = props;
   var outFields = props.fields,
     outFieldProps = props.fieldProps,

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

@@ -13,7 +13,7 @@ import { Descriptions, Form } from 'antd';
 import { merge } from 'lodash';
 import { useMemo } from 'react';
 import { DescriptionsStyle } from "../style";
-import { BaseForm } from "./base-form";
+import { Core } from "./core";
 import { jsx as _jsx } from "react/jsx-runtime";
 export var DescriptionsModel = function DescriptionsModel(_ref) {
   var _ref$descriptionsProp = _ref.descriptionsProps,
@@ -73,7 +73,7 @@ export var DescriptionsModel = function DescriptionsModel(_ref) {
             }
           }
         }),
-        children: /*#__PURE__*/_jsx(BaseForm, _objectSpread(_objectSpread({}, baseFormProps), {}, {
+        children: /*#__PURE__*/_jsx(Core, _objectSpread(_objectSpread({}, baseFormProps), {}, {
           itemMarginBottom: 0,
           fields: [_objectSpread(_objectSpread({}, otherData), {}, {
             rules: rules,

package/dist/components/base-form/core/index.d.ts

@@ -1,4 +1,4 @@
-import { BaseForm as RawBaseForm } from './base-form';
+import { Core } from './core';
 import { DescriptionsModel as BaseDescriptionsForm } from './descriptions-model';
-declare const BaseForm: typeof RawBaseForm;
+declare const BaseForm: typeof Core;
 export { BaseDescriptionsForm, BaseForm };

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

@@ -4,13 +4,13 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { BaseForm as RawBaseForm } from "./base-form";
+import { Core } from "./core";
 import { DescriptionsModel as BaseDescriptionsForm } from "./descriptions-model";
 import { jsx as _jsx } from "react/jsx-runtime";
 var BaseForm = function BaseForm(props) {
   if (props.type === 'descriptions') {
     return /*#__PURE__*/_jsx(BaseDescriptionsForm, _objectSpread({}, props));
   }
-  return /*#__PURE__*/_jsx(RawBaseForm, _objectSpread({}, props));
+  return /*#__PURE__*/_jsx(Core, _objectSpread({}, props));
 };
 export { BaseDescriptionsForm, BaseForm };

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

@@ -4,16 +4,25 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+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(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import enUS from "../../../locales/en-US.json";
 import { UserOutlined } from '@ant-design/icons';
 import { ProForm } from '@ant-design/pro-components';
-import { RexProConfigProvider } from "../../..";
+import { resetFormTouched, RexProConfigProvider } from "../../..";
 import { crush } from 'radash';
 import { createIntl } from 'react-intl';
 import { BaseForm } from "../core";
 import { getFieldsDefaultValues } from "../modules/handlerData";
 import { jsx as _jsx } from "react/jsx-runtime";
 export default (function () {
+  var _ProForm$useForm = ProForm.useForm(),
+    _ProForm$useForm2 = _slicedToArray(_ProForm$useForm, 1),
+    form = _ProForm$useForm2[0];
   var fields = [{
     label: '成本区间',
     valueType: 'multipleComponents',
@@ -70,7 +79,11 @@ export default (function () {
     }, {
       valueType: 'datePicker',
       field: 'multipleComponents-datePicker',
-      defaultValue: '2025-05-05'
+      defaultValue: '2025-05-05',
+      dependenciesV2: [{
+        action: 'clear',
+        field: 'multipleComponents-treeSelect'
+      }]
     }, {
       valueType: 'treeSelect',
       field: 'multipleComponents-treeSelect2',
@@ -237,6 +250,47 @@ export default (function () {
     //     target: true,
     //   }
     // ],
+  }, {
+    valueType: 'select',
+    field: 'org_id',
+    label: '部门',
+    itemWidth: '200px',
+    options: [{
+      label: '1',
+      value: '1'
+    }, {
+      label: '2',
+      value: '2'
+    }, {
+      label: '3',
+      value: '3'
+    }]
+  }, {
+    valueType: 'select',
+    field: 'job_id',
+    label: '岗位',
+    itemWidth: '200px',
+    options: [{
+      label: '1',
+      value: '1'
+    }, {
+      label: '2',
+      value: '2'
+    }, {
+      label: '3',
+      value: '3'
+    }],
+    dependenciesV2: [{
+      field: 'org_id',
+      action: 'show',
+      op: 'notEmpty'
+    }, {
+      field: 'org_id',
+      action: 'updateData'
+    }, {
+      field: 'org_id',
+      action: 'clear'
+    }]
   }];
   var initialValues = getFieldsDefaultValues(fields);
   // console.log(initialValues);
@@ -251,9 +305,12 @@ export default (function () {
     children: /*#__PURE__*/_jsx(ProForm, {
       initialValues: initialValues
       // size="small"
+      ,
+      form: form
       // readonly
       ,
       onFinish: function onFinish(values) {
+        resetFormTouched(values, form);
         console.log(values);
       },
       children: /*#__PURE__*/_jsx(BaseForm, {

package/dist/components/base-form/index.d.ts

@@ -2,3 +2,4 @@ export * from './core';
 export * from './modules/handlerData';
 export * from './modules/valuesToFields';
 export * from './types';
+export * from './utils';

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

@@ -1,4 +1,5 @@
 export * from "./core";
 export * from "./modules/handlerData";
 export * from "./modules/valuesToFields";
-export * from "./types";
+export * from "./types";
+export * from "./utils";

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

@@ -22,7 +22,7 @@ import classNames from 'classnames';
 import dayjs from 'dayjs';
 import { ProFormDateRangePickerV2 } from "../components/ProFormDateRangePickerV2";
 import { ProFormDigitRangeV2 } from "../components/ProFormDigitRangeV2";
-import { BaseForm } from "../core/base-form";
+import { Core } from "../core/core";
 import { getFieldsDefaultValues } from "./handlerData";
 import { createElement as _createElement } from "react";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -167,7 +167,7 @@ export var renderComponentNode = function renderComponentNode(outConfig, values,
       className: classNames('base-form-field-multiple-group', {
         compact: inlineItem.compact
       }),
-      children: /*#__PURE__*/_jsx(BaseForm, _objectSpread(_objectSpread({}, outConfig.rawAllProps), {}, {
+      children: /*#__PURE__*/_jsx(Core, _objectSpread(_objectSpread({}, outConfig.rawAllProps), {}, {
         itemWidth: "".concat(100 / ((_inlineItem$subItems$ = (_inlineItem$subItems = inlineItem.subItems) === null || _inlineItem$subItems === void 0 ? void 0 : _inlineItem$subItems.length) !== null && _inlineItem$subItems$ !== void 0 ? _inlineItem$subItems$ : 1), "%"),
         fields: inlineItem.subItems,
         itemMarginBottom: 0

package/dist/components/base-form/utils/index.d.ts

@@ -0,0 +1,47 @@
+import { FormInstance } from 'antd';
+/**
+ * @desc 重置表单的 touched 状态
+ * @example 解决场景：表单提交后，某些字段依赖其他字段变化触发清空，导致表单项的 touched 状态异常，从而影响表单提交后自动清空值。
+ * - 使用该函数可以在表单提交后，重置所有字段的 touched 状态，确保表单能够正确显示。
+ * @example 使用示例：
+ ```tsx
+    const fields: GetProps<typeof BaseForm>['fields'] = [
+      {
+        valueType: 'select',
+        field: 'org_id',
+        label: '部门',
+        options: [
+          { label: '1', value: '1' },
+          { label: '2', value: '2' },
+          { label: '3', value: '3' },
+        ],
+      },
+      {
+        valueType: 'select',
+        field: 'job_id',
+        label: '岗位',
+        options: [
+          { label: '1', value: '1' },
+          { label: '2', value: '2' },
+          { label: '3', value: '3' },
+        ],
+        dependenciesV2: [
+          {
+            field: 'org_id',
+            action: 'show',
+            op: 'notEmpty',
+          },
+          {
+            field: 'org_id',
+            action: 'updateData',
+          },
+          {
+            field: 'org_id',
+            action: 'clear',
+          },
+        ],
+      },
+    ]
+  ```
+ */
+export declare const resetFormTouched: (data: Record<string, any>, form: FormInstance) => void;

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

@@ -0,0 +1,56 @@
+import { crush } from 'radash';
+
+/**
+ * @desc 重置表单的 touched 状态
+ * @example 解决场景：表单提交后，某些字段依赖其他字段变化触发清空，导致表单项的 touched 状态异常，从而影响表单提交后自动清空值。
+ * - 使用该函数可以在表单提交后，重置所有字段的 touched 状态，确保表单能够正确显示。
+ * @example 使用示例：
+ ```tsx
+    const fields: GetProps<typeof BaseForm>['fields'] = [
+      {
+        valueType: 'select',
+        field: 'org_id',
+        label: '部门',
+        options: [
+          { label: '1', value: '1' },
+          { label: '2', value: '2' },
+          { label: '3', value: '3' },
+        ],
+      },
+      {
+        valueType: 'select',
+        field: 'job_id',
+        label: '岗位',
+        options: [
+          { label: '1', value: '1' },
+          { label: '2', value: '2' },
+          { label: '3', value: '3' },
+        ],
+        dependenciesV2: [
+          {
+            field: 'org_id',
+            action: 'show',
+            op: 'notEmpty',
+          },
+          {
+            field: 'org_id',
+            action: 'updateData',
+          },
+          {
+            field: 'org_id',
+            action: 'clear',
+          },
+        ],
+      },
+    ]
+  ```
+ */
+export var resetFormTouched = function resetFormTouched(data, form) {
+  var keys = Object.keys(crush(data));
+  form.setFields(keys.map(function (key) {
+    return {
+      name: key.split('.'),
+      touched: false
+    };
+  }));
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamias/rex-design",
-  "version": "0.0.36",
+  "version": "0.0.37",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",