fan-standard-comp 4.1.47 → 4.1.49

package/es/FormComp/DateTimeRangePicker/index.js

@@ -16,6 +16,10 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React, { useMemo, forwardRef } from 'react';
 import Field from "../FieldComponent/index";
 import dayjs from "dayjs";
+import isoWeek from 'dayjs/plugin/isoWeek'; // 引入ISO周插件
+
+dayjs.extend(isoWeek); // 必须执行此步才能使用 isoWeek 方法
+
 import classNames from 'classnames';
 import useStyle from "./style";
 var DateTimeRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
@@ -41,6 +45,9 @@ var DateTimeRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     }, {
       label: '日',
       value: 'day'
+    }, {
+      label: '周',
+      value: 'week'
     }, {
       label: '月',
       value: 'month'
@@ -77,6 +84,14 @@ var DateTimeRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
           config.format = 'YYYY-MM-DD';
           config = _objectSpread(_objectSpread({}, config), (timeTypeConfig === null || timeTypeConfig === void 0 ? void 0 : timeTypeConfig[activeType]) || {});
           break;
+        case "week":
+          config.picker = 'week';
+          var customWeekStartEndFormat = function customWeekStartEndFormat(date) {
+            return "".concat(date.year(), "\u5E74\u7B2C").concat(dayjs(date).isoWeek(), "\u5468");
+          };
+          config.format = customWeekStartEndFormat;
+          config = _objectSpread(_objectSpread({}, config), (timeTypeConfig === null || timeTypeConfig === void 0 ? void 0 : timeTypeConfig[activeType]) || {});
+          break;
         case "month":
           config.picker = 'month';
           config.format = 'MM月';

package/es/FormComp/FieldComponent/index.js

@@ -82,7 +82,8 @@ var FieldComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
     render = _providerConfig$props.render,
     _providerConfig$props7 = _providerConfig$props.defaultStyle,
     defaultStyle = _providerConfig$props7 === void 0 ? {} : _providerConfig$props7,
-    extendConfig = _providerConfig$props.extendConfig;
+    extendConfig = _providerConfig$props.extendConfig,
+    id = _providerConfig$props.id;
   var _providerConfig$props8 = _objectSpread(_objectSpread({}, providerConfig), props),
     selectOptions = _providerConfig$props8.selectOptions;
   var providerProtoConfig = (InitFanContext === null || InitFanContext === void 0 ? void 0 : InitFanContext[type || '']) || {}; // 使用上下文（全局配置）设置控件扩展的配置项
@@ -104,7 +105,8 @@ var FieldComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
     value: value,
     render: render,
     size: size,
-    ref: ref
+    ref: ref,
+    id: id
   }, providerProtoConfig), protoConfig);
   defaultProps.disabled = setFieldDisabled(fieldStatus === 'disabled', protoConfig);
   if (defaultProps.hasOwnProperty('showSearch') && type !== 'select' && type !== 'tree-select' && type !== 'cascader') {

package/es/FormComp/RenderItemGroup/index.js

@@ -61,7 +61,8 @@ var RenderItemGroup = function RenderItemGroup(props) {
     gutter = props.gutter,
     columnCount = props.columnCount,
     parentNode = props.parentNode,
-    onFieldsChange = props.onFieldsChange;
+    onFieldsChange = props.onFieldsChange,
+    formName = props.formName;
   var componentName = 'spec-item-group';
   var _useStyle = useStyle(componentName),
     _useStyle2 = _slicedToArray(_useStyle, 2),
@@ -183,6 +184,10 @@ var RenderItemGroup = function RenderItemGroup(props) {
     var componentStyle = field.componentStyle,
       extra = field.extra,
       preExtra = field.preExtra; // 当前可传参的配置值
+    if (field.label) {
+      // 修复label无法匹配控件id
+      field.id = formName ? formName + '_' + (field.filedName || field.fieldName) : field.filedName || field.fieldName;
+    }
     // 表单控件样式默认最小宽，如有单独配置width时，则不配置
     // @ts-ignore
     var FieldDefaultWidth = layout === 'inline' ? _objectSpread({}, (_general$inlineFormIt = general.inlineFormItemStyle) === null || _general$inlineFormIt === void 0 ? void 0 : _general$inlineFormIt[size]) : _objectSpread({}, general.inlineFormItemStyle.wide); // componentStyle?.width ? {} : { width: layout === 'inline' ? general.formItemStyle?.[size].width : general.formItemStyle.wide.width }

package/es/StandardFilter/index.js

@@ -292,6 +292,8 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
   // 更新表单控件值，用于外部获取当前表单实例(force是否强制清空表单)
   var updateFormFields = function updateFormFields(newVal, force, noForceUpdate) {
+    // 重置内部触发搜索的标志位，确保后续操作正常
+    triggerByFilterSubmit.current = false;
     // 标准化新值，undefined/null 视为空对象
     var normalizedNewVal = newVal || {};
     var isEmpty = Object.keys(normalizedNewVal).length === 0;
@@ -528,6 +530,7 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
     if (Array.isArray(reFormItemGroup)) {
       // 数组则默认加上"确认与取消"按钮
       return /*#__PURE__*/React.createElement(RenderItemGroup, _extends({
+        formName: formName,
         itemGroup: reFormItemGroup.concat(filterActionButtons),
         size: filterFormLayout === 'horizontal' ? 'xxlg' : 'md' // size决定栅格排列数量(4列排版）
         ,
@@ -567,8 +570,11 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
       permissionCodes: permissionCodes
     }, buttonGroupConfig))) : null;
   };
+  var formName = useMemo(function () {
+    return 'standard-filter-form-' + guid();
+  }, []);
   return wrapSSR( /*#__PURE__*/React.createElement(Form, {
-    name: 'standard-filter-form-' + guid()
+    name: formName
     // ref={filterFormRef}
     ,
     form: filterForm,

package/es/StandardList/index.js

@@ -1,4 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+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); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -82,7 +83,9 @@ var StandardList = /*#__PURE__*/forwardRef(function (props, ref) {
     _providerConfig$props4 = _providerConfig$props.loading,
     loading = _providerConfig$props4 === void 0 ? false : _providerConfig$props4,
     sortable = _providerConfig$props.sortable,
-    onChange = _providerConfig$props.onChange;
+    onChange = _providerConfig$props.onChange,
+    _providerConfig$props5 = _providerConfig$props.dndContextConfig,
+    dndContextConfig = _providerConfig$props5 === void 0 ? {} : _providerConfig$props5;
   var contentRef = useRef();
   useImperativeHandle(ref, function () {
     return contentRef === null || contentRef === void 0 ? void 0 : contentRef.current;
@@ -127,7 +130,19 @@ var StandardList = /*#__PURE__*/forwardRef(function (props, ref) {
   // useEffect(() => {
   //   props?.onChange(dataList);// 这里写你自己对父组件传值的方式
   // }, []);
-
+  // 关键配置：设置拖拽激活的最小移动距离
+  // const sensors = useSensors(
+  //   useSensor(MouseSensor, {
+  //     activationConstraint: {
+  //       distance: 5, // 移动超过 5px 才开始拖拽
+  //     },
+  //   }),
+  //   useSensor(TouchSensor, {
+  //     activationConstraint: {
+  //       distance: 5, // 触摸设备同理
+  //     },
+  //   })
+  // );
   return wrapSSR( /*#__PURE__*/React.createElement("div", {
     className: classNames(componentName, className, hashId, fullHeight ? 'spec-standard-list-fullheight' : ''),
     style: style,
@@ -136,10 +151,10 @@ var StandardList = /*#__PURE__*/forwardRef(function (props, ref) {
     spinning: loading,
     wrapperClassName: 'spec-standard-list-loading'
   }, sortable // 开启排序
-  ? /*#__PURE__*/React.createElement(DndContext, {
+  ? /*#__PURE__*/React.createElement(DndContext, _extends({
     onDragEnd: dragEndEvent,
     modifiers: [restrictToParentElement] // 拖动范围只能是父节点下区域
-  }, /*#__PURE__*/React.createElement(SortableContext, {
+  }, dndContextConfig), /*#__PURE__*/React.createElement(SortableContext, {
     items: options.map(function (c) {
       return c[optionName === null || optionName === void 0 ? void 0 : optionName.value];
     }),

package/lib/FormComp/DateTimeRangePicker/index.js

@@ -8,6 +8,7 @@ exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _index = _interopRequireDefault(require("../FieldComponent/index"));
 var _dayjs = _interopRequireDefault(require("dayjs"));
+var _isoWeek = _interopRequireDefault(require("dayjs/plugin/isoWeek"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _style = _interopRequireDefault(require("./style"));
 var _excluded = ["options", "value", "onChange", "optionType", "timeTypeConfig", "radioConfig", "outerStyle", "outerClassname"];
@@ -27,6 +28,10 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 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; }
+// 引入ISO周插件
+
+_dayjs.default.extend(_isoWeek.default); // 必须执行此步才能使用 isoWeek 方法
+
 var DateTimeRangePicker = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var options = props.options,
     value = props.value,
@@ -50,6 +55,9 @@ var DateTimeRangePicker = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
     }, {
       label: '日',
       value: 'day'
+    }, {
+      label: '周',
+      value: 'week'
     }, {
       label: '月',
       value: 'month'
@@ -86,6 +94,14 @@ var DateTimeRangePicker = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
           config.format = 'YYYY-MM-DD';
           config = _objectSpread(_objectSpread({}, config), (timeTypeConfig === null || timeTypeConfig === void 0 ? void 0 : timeTypeConfig[activeType]) || {});
           break;
+        case "week":
+          config.picker = 'week';
+          var customWeekStartEndFormat = function customWeekStartEndFormat(date) {
+            return "".concat(date.year(), "\u5E74\u7B2C").concat((0, _dayjs.default)(date).isoWeek(), "\u5468");
+          };
+          config.format = customWeekStartEndFormat;
+          config = _objectSpread(_objectSpread({}, config), (timeTypeConfig === null || timeTypeConfig === void 0 ? void 0 : timeTypeConfig[activeType]) || {});
+          break;
         case "month":
           config.picker = 'month';
           config.format = 'MM月';

package/lib/FormComp/FieldComponent/index.js

@@ -89,7 +89,8 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     render = _providerConfig$props.render,
     _providerConfig$props7 = _providerConfig$props.defaultStyle,
     defaultStyle = _providerConfig$props7 === void 0 ? {} : _providerConfig$props7,
-    extendConfig = _providerConfig$props.extendConfig;
+    extendConfig = _providerConfig$props.extendConfig,
+    id = _providerConfig$props.id;
   var _providerConfig$props8 = _objectSpread(_objectSpread({}, providerConfig), props),
     selectOptions = _providerConfig$props8.selectOptions;
   var providerProtoConfig = (InitFanContext === null || InitFanContext === void 0 ? void 0 : InitFanContext[type || '']) || {}; // 使用上下文（全局配置）设置控件扩展的配置项
@@ -111,7 +112,8 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     value: value,
     render: render,
     size: size,
-    ref: ref
+    ref: ref,
+    id: id
   }, providerProtoConfig), protoConfig);
   defaultProps.disabled = setFieldDisabled(fieldStatus === 'disabled', protoConfig);
   if (defaultProps.hasOwnProperty('showSearch') && type !== 'select' && type !== 'tree-select' && type !== 'cascader') {

package/lib/FormComp/RenderItemGroup/index.js

@@ -67,7 +67,8 @@ var RenderItemGroup = function RenderItemGroup(props) {
     gutter = props.gutter,
     columnCount = props.columnCount,
     parentNode = props.parentNode,
-    onFieldsChange = props.onFieldsChange;
+    onFieldsChange = props.onFieldsChange,
+    formName = props.formName;
   var componentName = 'spec-item-group';
   var _useStyle = (0, _style.default)(componentName),
     _useStyle2 = _slicedToArray(_useStyle, 2),
@@ -189,6 +190,10 @@ var RenderItemGroup = function RenderItemGroup(props) {
     var componentStyle = field.componentStyle,
       extra = field.extra,
       preExtra = field.preExtra; // 当前可传参的配置值
+    if (field.label) {
+      // 修复label无法匹配控件id
+      field.id = formName ? formName + '_' + (field.filedName || field.fieldName) : field.filedName || field.fieldName;
+    }
     // 表单控件样式默认最小宽，如有单独配置width时，则不配置
     // @ts-ignore
     var FieldDefaultWidth = layout === 'inline' ? _objectSpread({}, (_general$inlineFormIt = _data.general.inlineFormItemStyle) === null || _general$inlineFormIt === void 0 ? void 0 : _general$inlineFormIt[size]) : _objectSpread({}, _data.general.inlineFormItemStyle.wide); // componentStyle?.width ? {} : { width: layout === 'inline' ? general.formItemStyle?.[size].width : general.formItemStyle.wide.width }

package/lib/StandardFilter/index.js

@@ -300,6 +300,8 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
 
   // 更新表单控件值，用于外部获取当前表单实例(force是否强制清空表单)
   var updateFormFields = function updateFormFields(newVal, force, noForceUpdate) {
+    // 重置内部触发搜索的标志位，确保后续操作正常
+    triggerByFilterSubmit.current = false;
     // 标准化新值，undefined/null 视为空对象
     var normalizedNewVal = newVal || {};
     var isEmpty = Object.keys(normalizedNewVal).length === 0;
@@ -536,6 +538,7 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     if (Array.isArray(reFormItemGroup)) {
       // 数组则默认加上"确认与取消"按钮
       return /*#__PURE__*/_react.default.createElement(_RenderItemGroup.default, _extends({
+        formName: formName,
         itemGroup: reFormItemGroup.concat(filterActionButtons),
         size: filterFormLayout === 'horizontal' ? 'xxlg' : 'md' // size决定栅格排列数量(4列排版）
         ,
@@ -575,8 +578,11 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       permissionCodes: permissionCodes
     }, buttonGroupConfig))) : null;
   };
+  var formName = (0, _react.useMemo)(function () {
+    return 'standard-filter-form-' + guid();
+  }, []);
   return wrapSSR( /*#__PURE__*/_react.default.createElement(_antd.Form, {
-    name: 'standard-filter-form-' + guid()
+    name: formName
     // ref={filterFormRef}
     ,
     form: filterForm,

package/lib/StandardList/index.js

@@ -17,6 +17,7 @@ var _SortableItem = _interopRequireDefault(require("./SortableItem"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+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); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -90,7 +91,9 @@ var StandardList = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     _providerConfig$props4 = _providerConfig$props.loading,
     loading = _providerConfig$props4 === void 0 ? false : _providerConfig$props4,
     sortable = _providerConfig$props.sortable,
-    onChange = _providerConfig$props.onChange;
+    onChange = _providerConfig$props.onChange,
+    _providerConfig$props5 = _providerConfig$props.dndContextConfig,
+    dndContextConfig = _providerConfig$props5 === void 0 ? {} : _providerConfig$props5;
   var contentRef = (0, _react.useRef)();
   (0, _react.useImperativeHandle)(ref, function () {
     return contentRef === null || contentRef === void 0 ? void 0 : contentRef.current;
@@ -135,7 +138,19 @@ var StandardList = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   // useEffect(() => {
   //   props?.onChange(dataList);// 这里写你自己对父组件传值的方式
   // }, []);
-
+  // 关键配置：设置拖拽激活的最小移动距离
+  // const sensors = useSensors(
+  //   useSensor(MouseSensor, {
+  //     activationConstraint: {
+  //       distance: 5, // 移动超过 5px 才开始拖拽
+  //     },
+  //   }),
+  //   useSensor(TouchSensor, {
+  //     activationConstraint: {
+  //       distance: 5, // 触摸设备同理
+  //     },
+  //   })
+  // );
   return wrapSSR( /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)(componentName, className, hashId, fullHeight ? 'spec-standard-list-fullheight' : ''),
     style: style,
@@ -144,10 +159,10 @@ var StandardList = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     spinning: loading,
     wrapperClassName: 'spec-standard-list-loading'
   }, sortable // 开启排序
-  ? /*#__PURE__*/_react.default.createElement(_core.DndContext, {
+  ? /*#__PURE__*/_react.default.createElement(_core.DndContext, _extends({
     onDragEnd: dragEndEvent,
     modifiers: [_modifiers.restrictToParentElement] // 拖动范围只能是父节点下区域
-  }, /*#__PURE__*/_react.default.createElement(_sortable.SortableContext, {
+  }, dndContextConfig), /*#__PURE__*/_react.default.createElement(_sortable.SortableContext, {
     items: options.map(function (c) {
       return c[optionName === null || optionName === void 0 ? void 0 : optionName.value];
     }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fan-standard-comp",
-  "version": "4.1.47",
+  "version": "4.1.49",
   "description": "FZ standard-comp,basic of antd5.0 and custom component.",
   "main": "lib/index.js",
   "module": "es/index.js",