@hw-component/form 1.2.5 → 1.2.7

package/lib/Select/index.js

@@ -13,6 +13,7 @@ var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
 require('core-js/modules/es.array.map.js');
 var jsxRuntime = require('react/jsx-runtime');
+var React = require('react');
 var antd = require('antd');
 var norHooks = require('./hooks/norHooks.js');
 var changeHooks = require('./hooks/changeHooks.js');
@@ -22,7 +23,8 @@ var AllSelect = require('./components/AllSelect.js');
 var index = require('../hooks/index.js');
 var HFormConnect = require('../Form/HFormConnect.js');
 
-var _excluded = ["style", "mode", "options", "modeConfig", "value", "onChange", "fieldNames", "request", "manual", "optionLabelProp", "filterProvider", "optionFilterProp", "serviceSearch", "onSearch", "filterOption", "showSearch", "labelInValue", "noMatchItemRender", "allSelect", "addDispatchListener", "addFormat", "dispatch"];
+var _excluded = ["style", "mode", "options", "modeConfig", "value", "onChange", "fieldNames", "request", "manual", "optionLabelProp", "filterProvider", "optionFilterProp", "serviceSearch", "onSearch", "filterOption", "showSearch", "labelInValue", "noMatchItemRender", "allSelect", "addDispatchListener", "addFormat", "dispatch"],
+  _excluded2 = ["value", "label"];
 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 Option = antd.Select.Option;
@@ -133,16 +135,16 @@ var Index = function Index(_ref) {
   }, props), {}, {
     children: data === null || data === void 0 ? void 0 : data.map(function (item) {
       var optionValue = item.value,
-        label = item.label;
+        label = item.label,
+        oItem = _objectWithoutProperties(item, _excluded2);
       var result = (filterProvider === null || filterProvider === void 0 ? void 0 : filterProvider(item)) || label;
       var filter = _defineProperty({}, optionFilterProp, result);
-      return jsxRuntime.jsx(Option, _objectSpread(_objectSpread({
+      return /*#__PURE__*/React.createElement(Option, _objectSpread(_objectSpread({}, oItem), {}, {
         value: optionValue,
+        key: optionValue,
         label: label,
         mode: mode
-      }, filter), {}, {
-        children: render ? render(item, val) : label
-      }), optionValue);
+      }, filter), render ? render(item, val) : label);
     })
   }));
 };

package/lib/Upload/UrlUpload/hooks.js

@@ -9,11 +9,9 @@ var useDefaultExFiles = function useDefaultExFiles(_ref) {
   var _ref$mediaType = _ref.mediaType,
     mediaType = _ref$mediaType === void 0 ? enums.MediaTypeEnum.img : _ref$mediaType,
     exFiles = _ref.exFiles;
-  console.log(exFiles, "exFiles");
-  if (exFiles) {
+  if (exFiles || exFiles === null) {
     return exFiles;
   }
-  console.log(defaultExFiles, mediaType === enums.MediaTypeEnum.video, "mediaType");
   return defaultExFiles[mediaType];
 };
 

package/lib/Upload/hooks/propsMaker.js

@@ -19,7 +19,6 @@ var useProps = function useProps(_ref) {
   var configUploadProps = FormConfigProvider.useFormConfigContext("uploadProps");
   var inputProps = {
     request: request,
-    exFiles: exFiles,
     maxSize: maxSize
   };
   var keys = Object.keys(inputProps);
@@ -30,7 +29,11 @@ var useProps = function useProps(_ref) {
       return;
     }
   });
-  return resultProps;
+  var defaultExFiles = exFiles === undefined ? resultProps.exFiles : exFiles;
+  console.log(defaultExFiles);
+  return _objectSpread(_objectSpread({}, resultProps), {}, {
+    exFiles: defaultExFiles
+  });
 };
 
 exports.useProps = useProps;

package/lib/Upload/modal.d.ts

@@ -6,7 +6,7 @@ import type { MediaTypeEnum } from "@/components/Upload/enums";
 import type { addFormatItemModal } from "@/components/Form/modal";
 import type React from "react";
 export interface IUpLoadProps extends Omit<UploadProps, "onChange"> {
-    exFiles?: string[];
+    exFiles?: string[] | null;
     request?: (file: Exclude<BeforeUploadFileType, File | boolean> | RcFile) => Promise<{
         url: string;
     }>;

package/lib/Upload/util.d.ts

@@ -1,5 +1,5 @@
 import type { UploadFile } from "antd/es/upload/interface";
 export declare const getFileExt: (file: UploadFile) => string;
-export declare const checkFileType: (file: UploadFile, exFiles?: string[]) => boolean;
+export declare const checkFileType: (file: UploadFile, exFiles?: string[] | null) => boolean;
 export declare const checkFileSize: (file: UploadFile, maxSize?: number) => boolean;
 export declare const fileToBase64: (file: any) => Promise<unknown>;

package/lib/Upload/util.js

@@ -11,6 +11,9 @@ var getFileExt = function getFileExt(file) {
 };
 var checkFileType = function checkFileType(file) {
   var exFiles = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  if (!exFiles) {
+    return true;
+  }
   var exName = getFileExt(file);
   return exFiles.indexOf(exName) !== -1;
 };

package/lib/index.css

@@ -59,7 +59,7 @@
 .ant-hw-form-base-item-left .ant-hw-form-item-required {
   position: absolute;
   left: -10px;
-  top: 0px;
+  top: 0;
 }
 .ant-hw-form-base-item-left .ant-hw-form-label-item {
   position: relative;

package/package.json

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

package/src/components/Form/index.less

@@ -17,12 +17,12 @@
   .@{ant-prefix}-hw-form-item-colon {
     text-align: left;
   }
-  .@{ant-prefix}-hw-form-item-required{
+  .@{ant-prefix}-hw-form-item-required {
     position: absolute;
     left: -10px;
     top: 0;
   }
-  .@{ant-prefix}-hw-form-label-item{
+  .@{ant-prefix}-hw-form-label-item {
     position: relative;
   }
 }
@@ -52,12 +52,12 @@
   .@{ant-prefix}-hw-form-item-colon {
     text-align: left;
   }
-  .@{ant-prefix}-hw-form-item-required{
+  .@{ant-prefix}-hw-form-item-required {
     position: absolute;
     left: -10px;
-    top: 0px;
+    top: 0;
   }
-  .@{ant-prefix}-hw-form-label-item{
+  .@{ant-prefix}-hw-form-label-item {
     position: relative;
   }
   .@{ant-prefix}-form-item-label > label {
@@ -65,7 +65,7 @@
   }
 }
 
-.@{ant-prefix}-hw-form-item-no-required{
+.@{ant-prefix}-hw-form-item-no-required {
   display: none;
 }
 .@{ant-prefix}-hw-form-item-required:before {
@@ -78,8 +78,8 @@
   content: "*";
   margin-right: 4px;
 }
-.@{ant-prefix}-hw-form-form-item{
- .@{ant-prefix}-form-item-label{
+.@{ant-prefix}-hw-form-form-item {
+ .@{ant-prefix}-form-item-label {
     overflow:visible
  }
 }

package/src/components/Form/modal.ts

@@ -34,7 +34,7 @@ import type { ForwardedRef } from "react";
 import type { DataFnProvider } from "../modal";
 import type { ColProps } from "antd/lib/grid/col";
 import type { Gutter } from "antd/lib/grid/row";
-import {IUrlUploadProps} from "../Upload/modal";
+import type {IUrlUploadProps} from "../Upload/modal";
 
 type RenderFun = (
   props: HItemProps,

package/src/components/Select/index.tsx

@@ -105,11 +105,12 @@ const Index: React.FC<HSelectProps> = ({
       {...props}
     >
       {data?.map((item) => {
-        const { value: optionValue, label } = item;
+        const { value: optionValue, label ,...oItem} = item;
         const result = filterProvider?.(item) || label;
         const filter = { [optionFilterProp]: result };
         return (
           <Option
+              {...oItem}
             value={optionValue}
             key={optionValue}
             label={label}

package/src/components/Upload/UrlUpload/hooks.ts

@@ -6,11 +6,8 @@ const defaultExFiles={
    [MediaTypeEnum.audio]:["MP3"],
 }
 export const useDefaultExFiles=({mediaType=MediaTypeEnum.img,exFiles}: IUrlUploadProps)=>{
-   console.log(exFiles,"exFiles")
-   if (exFiles){
+   if (exFiles||exFiles===null){
        return exFiles;
    };
-   console.log(defaultExFiles,mediaType===MediaTypeEnum.video,"mediaType")
-
    return defaultExFiles[mediaType]
 }

package/src/components/Upload/UrlUpload/index.tsx

@@ -26,11 +26,10 @@ const Index = ({
   ...props
 }: IUrlUploadProps) => {
   const { maxCount} = props;
-  const defaultExFiles: string[]=useDefaultExFiles({mediaType,exFiles});
+  const defaultExFiles: string[]|null=useDefaultExFiles({mediaType,exFiles});
   const [url, setUrl] = useState("");
   const [load, setLoad] = useState<boolean>(false);
   const ref = useRef<IUploadRefModal | null>(null);
-
   const onReady = () => {
     const newFileList = [...value];
     newFileList.push({

package/src/components/Upload/hooks/change.ts

@@ -14,7 +14,7 @@ const checkFile = (item: UploadFile, oldFile: UploadFile[] = []) => {
 const matchFile = (
   newFile: UploadFile[],
   oldFile: UploadFile[] = [],
-  exFiles?: string[],
+  exFiles?: string[]|null,
   maxSize?: number
 ) => {
   const newResultFileList: UploadFile[] = [];

package/src/components/Upload/hooks/propsMaker.ts

@@ -5,7 +5,6 @@ export const useProps = ({ request, exFiles, maxSize }: IUpLoadProps) => {
   const configUploadProps = useFormConfigContext("uploadProps");
   const inputProps = {
     request,
-    exFiles,
     maxSize,
   };
   const keys = Object.keys(inputProps);
@@ -16,5 +15,10 @@ export const useProps = ({ request, exFiles, maxSize }: IUpLoadProps) => {
       return;
     }
   });
-  return resultProps;
+  const defaultExFiles=exFiles===undefined?resultProps.exFiles:exFiles;
+  console.log(defaultExFiles)
+  return {
+    ...resultProps,
+    exFiles:defaultExFiles
+  };
 };

package/src/components/Upload/index.tsx

@@ -32,7 +32,7 @@ const Index: React.ForwardRefRenderFunction<IUploadRefModal, IUpLoadProps> = (
     value,
     maxCount,
     onChange,
-      thumbUrl
+    thumbUrl
   });
   useImperativeHandle(ref, () => {
     return {

package/src/components/Upload/modal.ts

@@ -7,7 +7,7 @@ import type { addFormatItemModal } from "@/components/Form/modal";
 import type React from "react";
 
 export interface IUpLoadProps extends Omit<UploadProps, "onChange"> {
-  exFiles?: string[];
+  exFiles?: string[]|null;
   request?: (
     file: Exclude<BeforeUploadFileType, File | boolean> | RcFile
   ) => Promise<{ url: string }>;

package/src/components/Upload/util.ts

@@ -6,7 +6,10 @@ export const getFileExt = (file: UploadFile): string => {
   return name.substring(index + 1).toUpperCase();
 };
 
-export const checkFileType = (file: UploadFile, exFiles: string[] = []) => {
+export const checkFileType = (file: UploadFile, exFiles: string[]|null = []) => {
+  if (!exFiles){
+     return  true;
+  }
   const exName: string = getFileExt(file);
   return exFiles.indexOf(exName) !== -1;
 };