@hw-component/form 1.3.7 → 1.3.9

package/es/Form/index.d.ts

@@ -1,3 +1,3 @@
 import type { HFormProps } from "./modal";
-declare const _default: ({ configData, labelWidth, form, request, onFinish, infoRequest, valueType, initialValues, params, onValuesChange, itemSpan, hideLabel: formHideLabel, gutter, submitLoading, labelAlign: formLabelAlign, formItemStyle, itemProps: formItemProps, ...props }: HFormProps) => JSX.Element;
+declare const _default: ({ configData, labelWidth, form, request, onFinish, infoRequest, valueType, initialValues, params, onValuesChange, itemSpan, hideLabel: formHideLabel, gutter, submitLoading, labelAlign: formLabelAlign, formItemStyle, itemProps: formItemProps, colon, ...props }: HFormProps) => JSX.Element;
 export default _default;

package/es/Form/index.js

@@ -20,7 +20,7 @@ import Index from '../PageHandler/index.js';
 import useInitConfigData from './hooks/useInitConfigData.js';
 import InitSet from './InitSet.js';
 
-var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues", "params", "onValuesChange", "itemSpan", "hideLabel", "gutter", "submitLoading", "labelAlign", "formItemStyle", "itemProps"];
+var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues", "params", "onValuesChange", "itemSpan", "hideLabel", "gutter", "submitLoading", "labelAlign", "formItemStyle", "itemProps", "colon"];
 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; }
 var HForm = (function (_ref) {
@@ -45,6 +45,8 @@ var HForm = (function (_ref) {
     formItemStyle = _ref.formItemStyle,
     _ref$itemProps = _ref.itemProps,
     formItemProps = _ref$itemProps === void 0 ? {} : _ref$itemProps,
+    _ref$colon = _ref.colon,
+    colon = _ref$colon === void 0 ? true : _ref$colon,
     props = _objectWithoutProperties(_ref, _excluded);
   var hForm = useCurrentForm(form);
   var _useInitConfigData = useInitConfigData({
@@ -108,7 +110,8 @@ var HForm = (function (_ref) {
               _itemData$style = itemData.style,
               style = _itemData$style === void 0 ? formItemStyle : _itemData$style,
               _itemData$itemProps = itemData.itemProps,
-              itemProps = _itemData$itemProps === void 0 ? {} : _itemData$itemProps;
+              itemProps = _itemData$itemProps === void 0 ? {} : _itemData$itemProps,
+              itemColon = itemData.colon;
             var defaultItemProps = _objectSpread(_objectSpread({}, formItemProps), itemProps);
             return /*#__PURE__*/createElement(Item, _objectSpread(_objectSpread({}, itemData), {}, {
               labelAlign: labelAlign,
@@ -117,7 +120,8 @@ var HForm = (function (_ref) {
               itemProps: defaultItemProps,
               hideLabel: hideLabel,
               itemSpan: itemSpan,
-              labelWidth: itemLabelWidth || labelWidth
+              labelWidth: itemLabelWidth || labelWidth,
+              colon: typeof itemColon === "undefined" ? colon : itemColon
             }));
           })
         }), jsx(InitSet, {})]

package/es/Select/index.js

@@ -134,7 +134,8 @@ var Index = function Index(_ref) {
       var optionValue = item.value,
         label = item.label,
         oItem = _objectWithoutProperties(item, _excluded2);
-      var result = (filterProvider === null || filterProvider === void 0 ? void 0 : filterProvider(item)) || label;
+      var filterKey = filterProvider || "label";
+      var result = typeof filterProvider === "function" ? filterProvider === null || filterProvider === void 0 ? void 0 : filterProvider(item) : item[filterKey];
       var filter = _defineProperty({}, optionFilterProp, result);
       return /*#__PURE__*/createElement(Option, _objectSpread(_objectSpread({}, oItem), {}, {
         value: optionValue,

package/es/Select/modal.d.ts

@@ -13,12 +13,13 @@ export interface ModeConfig {
     multiple?: ModeConfigItem;
     tags?: ModeConfigItem;
 }
+type FilterProviderFn = (item: any) => string;
 export interface HSelectProps extends Omit<SelectProps, "options" | "placeholder"> {
     style?: React.CSSProperties;
     request?: PromiseFnResult<any, OptionType[]>;
     manual?: boolean;
     modeConfig?: ModeConfig;
-    filterProvider?: (item: any) => string;
+    filterProvider?: FilterProviderFn | string;
     serviceSearch?: boolean;
     options?: OptionType[];
     noMatchItemRender?: RenderFn;

package/lib/Form/index.d.ts

@@ -1,3 +1,3 @@
 import type { HFormProps } from "./modal";
-declare const _default: ({ configData, labelWidth, form, request, onFinish, infoRequest, valueType, initialValues, params, onValuesChange, itemSpan, hideLabel: formHideLabel, gutter, submitLoading, labelAlign: formLabelAlign, formItemStyle, itemProps: formItemProps, ...props }: HFormProps) => JSX.Element;
+declare const _default: ({ configData, labelWidth, form, request, onFinish, infoRequest, valueType, initialValues, params, onValuesChange, itemSpan, hideLabel: formHideLabel, gutter, submitLoading, labelAlign: formLabelAlign, formItemStyle, itemProps: formItemProps, colon, ...props }: HFormProps) => JSX.Element;
 export default _default;

package/lib/Form/index.js

@@ -23,7 +23,7 @@ var index$1 = require('../PageHandler/index.js');
 var useInitConfigData = require('./hooks/useInitConfigData.js');
 var InitSet = require('./InitSet.js');
 
-var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues", "params", "onValuesChange", "itemSpan", "hideLabel", "gutter", "submitLoading", "labelAlign", "formItemStyle", "itemProps"];
+var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues", "params", "onValuesChange", "itemSpan", "hideLabel", "gutter", "submitLoading", "labelAlign", "formItemStyle", "itemProps", "colon"];
 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; }
 var HForm = (function (_ref) {
@@ -48,6 +48,8 @@ var HForm = (function (_ref) {
     formItemStyle = _ref.formItemStyle,
     _ref$itemProps = _ref.itemProps,
     formItemProps = _ref$itemProps === void 0 ? {} : _ref$itemProps,
+    _ref$colon = _ref.colon,
+    colon = _ref$colon === void 0 ? true : _ref$colon,
     props = _objectWithoutProperties(_ref, _excluded);
   var hForm = index.useCurrentForm(form);
   var _useInitConfigData = useInitConfigData.default({
@@ -111,7 +113,8 @@ var HForm = (function (_ref) {
               _itemData$style = itemData.style,
               style = _itemData$style === void 0 ? formItemStyle : _itemData$style,
               _itemData$itemProps = itemData.itemProps,
-              itemProps = _itemData$itemProps === void 0 ? {} : _itemData$itemProps;
+              itemProps = _itemData$itemProps === void 0 ? {} : _itemData$itemProps,
+              itemColon = itemData.colon;
             var defaultItemProps = _objectSpread(_objectSpread({}, formItemProps), itemProps);
             return /*#__PURE__*/React.createElement(index$3.default, _objectSpread(_objectSpread({}, itemData), {}, {
               labelAlign: labelAlign,
@@ -120,7 +123,8 @@ var HForm = (function (_ref) {
               itemProps: defaultItemProps,
               hideLabel: hideLabel,
               itemSpan: itemSpan,
-              labelWidth: itemLabelWidth || labelWidth
+              labelWidth: itemLabelWidth || labelWidth,
+              colon: typeof itemColon === "undefined" ? colon : itemColon
             }));
           })
         }), jsxRuntime.jsx(InitSet.default, {})]

package/lib/Select/index.js

@@ -137,7 +137,8 @@ var Index = function Index(_ref) {
       var optionValue = item.value,
         label = item.label,
         oItem = _objectWithoutProperties(item, _excluded2);
-      var result = (filterProvider === null || filterProvider === void 0 ? void 0 : filterProvider(item)) || label;
+      var filterKey = filterProvider || "label";
+      var result = typeof filterProvider === "function" ? filterProvider === null || filterProvider === void 0 ? void 0 : filterProvider(item) : item[filterKey];
       var filter = _defineProperty({}, optionFilterProp, result);
       return /*#__PURE__*/React.createElement(Option, _objectSpread(_objectSpread({}, oItem), {}, {
         value: optionValue,

package/lib/Select/modal.d.ts

@@ -13,12 +13,13 @@ export interface ModeConfig {
     multiple?: ModeConfigItem;
     tags?: ModeConfigItem;
 }
+type FilterProviderFn = (item: any) => string;
 export interface HSelectProps extends Omit<SelectProps, "options" | "placeholder"> {
     style?: React.CSSProperties;
     request?: PromiseFnResult<any, OptionType[]>;
     manual?: boolean;
     modeConfig?: ModeConfig;
-    filterProvider?: (item: any) => string;
+    filterProvider?: FilterProviderFn | string;
     serviceSearch?: boolean;
     options?: OptionType[];
     noMatchItemRender?: RenderFn;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "1.3.7",
+  "version": "1.3.9",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

package/src/components/Form/index.tsx

@@ -27,6 +27,7 @@ export default ({
   labelAlign: formLabelAlign,
   formItemStyle,
   itemProps: formItemProps = {},
+    colon=true,
   ...props
 }: HFormProps) => {
   const hForm = useCurrentForm(form);
@@ -86,6 +87,7 @@ export default ({
                 name,
                 style = formItemStyle,
                 itemProps = {},
+                colon:itemColon
               } = itemData;
               const defaultItemProps = {
                 ...formItemProps,
@@ -101,6 +103,7 @@ export default ({
                   hideLabel={hideLabel}
                   itemSpan={itemSpan}
                   labelWidth={itemLabelWidth || labelWidth}
+                  colon={typeof itemColon==="undefined"?colon:itemColon}
                 />
               );
             })}

package/src/components/Select/index.tsx

@@ -106,7 +106,8 @@ const Index: React.FC<HSelectProps> = ({
     >
       {data?.map((item) => {
         const { value: optionValue, label, ...oItem } = item;
-        const result = filterProvider?.(item) || label;
+        const filterKey=filterProvider||"label";
+        const result = typeof filterProvider==="function"?filterProvider?.(item):item[(filterKey as string)];
         const filter = { [optionFilterProp]: result };
         return (
           <Option

package/src/components/Select/modal.ts

@@ -14,13 +14,14 @@ export interface ModeConfig {
   multiple?: ModeConfigItem;
   tags?: ModeConfigItem;
 }
+type FilterProviderFn=(item: any) => string;
 export interface HSelectProps
   extends Omit<SelectProps, "options" | "placeholder"> {
   style?: React.CSSProperties;
   request?: PromiseFnResult<any, OptionType[]>;
   manual?: boolean;
   modeConfig?: ModeConfig;
-  filterProvider?: (item: any) => string; //筛选字段默认为label
+  filterProvider?:FilterProviderFn|string; //筛选字段默认为label
   serviceSearch?: boolean; //服务端搜索
   options?: OptionType[];
   noMatchItemRender?: RenderFn; //没有数据

package/src/pages/Form/index.tsx

@@ -160,6 +160,7 @@ export default () => {
         <HForm
           configData={formData(options)}
           labelWidth={200}
+          itemSpan={{span:6}}
           form={form}
           labelAlign={"right"}
           onFinish={(value) => {