@hzab/form-render 1.7.9 → 1.7.11

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# @hzab/form-render@1.7.11
+
+feat: 只读模式 PreviewText emptyValue 配置
+
+# @hzab/form-render@1.7.10
+
+fix: 图片链接添加 query
+
 # @hzab/form-render@1.7.9
 
 fix: 缩略图后缀名修改

package/README.md

@@ -147,6 +147,7 @@ import FormRender from "@hzab/form-render";
 | initialValues      | Object   | 否   | -          | form 初始值                                                                                |
 | components         | Object   | 否   | -          | 自定义组件                                                                                 |
 | formOptions        | Object   | 否   | -          | createForm 的参数                                                                          |
+| emptyValue         | string   | 否   | N/A        | 只读模式 PreviewText emptyValue 配置                                                       |
 | disabled           | boolean  | 否   | -          | 禁用状态                                                                                   |
 | readOnly           | boolean  | 否   | -          | 只读状态                                                                                   |
 | onFormValuesChange | Function | 否   | -          | 表单事件 (form)=>{} https://core.formilyjs.org/zh-CN/api/entry/form-effect-hooks           |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/form-render",
-  "version": "1.7.9",
+  "version": "1.7.11",
   "description": "",
   "main": "src",
   "scripts": {
@@ -25,7 +25,7 @@
   "devDependencies": {
     "@hzab/data-model": "^1.8.8",
     "@hzab/permissions": "^0.1.1",
-    "@hzab/utils": "^1.0.6",
+    "@hzab/utils": "^1.0.16",
     "@hzab/webpack-config": "0.0.12",
     "@types/react": "^17.0.62",
     "@types/react-dom": "^17.0.20",

package/src/components/Upload/common/handleIOFileList.ts

@@ -5,13 +5,15 @@ import { getUFileName, getFileName, getFullFileName, getFileExt } from "@hzab/ut
 import { getFileNameObj } from "@hzab/utils/src/upload/uploadUtils";
 import { nanoidNumALetters } from "@hzab/utils/src/nanoid";
 import { getFormRenderPCGlobalServeConfig } from "../../../globalConfig";
+import { addQuery } from "@hzab/utils/src/url"
+
 
 /**
  * 出入参归一化
  * 统一成对象格式用于内部处理
  {
  }
- 
+
  */
 
 /**
@@ -69,7 +71,6 @@ export interface IHandlerOpt {
   /** 预览配置参数 */
   previewConfig?: Object;
   thumbnailParams?: string;
-  selfUrlList?: string[];
   /** maxCount === 1 时是否去除数组，直接返回内容 */
   isResRemoveArr: boolean;
   /** 最大文件数量 */
@@ -174,16 +175,7 @@ export function mergePreviewConfig(uri, previewConfig) {
 
   return _uri;
 }
-/**判断是否私有 */
-const isSelf = (selfUrlList, fileUrl) => {
-  let flag = "?";
-  selfUrlList?.forEach((el) => {
-    if (fileUrl?.startsWith(el)) {
-      flag = "&";
-    }
-  });
-  return flag;
-};
+
 /**
  * 子项数据归一化
  * 字符串：url、base64
@@ -195,7 +187,7 @@ export const handleInputItem = (data, opt: IHandlerOpt) => {
     console.warn("Upload handleInputData 请传入正确的数据");
     return data;
   }
-  const { thumbnailParams, selfUrlList } = opt;
+  const { thumbnailParams } = opt;
 
   let file = {
     ...fileTpl,
@@ -214,14 +206,14 @@ export const handleInputItem = (data, opt: IHandlerOpt) => {
     file.type = getFileType(file.url);
     file.ext = getFileExt(file.url);
     if (getFormRenderPCGlobalServeConfig()?.showThumbnail) {
-      file.thumbUrl = `${_data}${thumbnailParams ? isSelf(selfUrlList, _data) + thumbnailParams : ""}`;
+      file.thumbUrl = addQuery(_data, thumbnailParams);
     }
   } else if (typeof _data === "object") {
     const sourceData = _data.originFileObj || _data;
     file.id = _data.id || _data.uid;
     file.url = sourceData.url || sourceData.ossUrl;
     if (getFormRenderPCGlobalServeConfig()?.showThumbnail) {
-      file.thumbUrl = `${file.url}${thumbnailParams ? isSelf(selfUrlList, file.url) + thumbnailParams : ""}`;
+      file.thumbUrl = addQuery(file.url, thumbnailParams);
     }
     file.storeUrl = file.url;
     file.originalFilename = _data.originalFilename || getFullFileName(file.url) || _data.name;

package/src/components/Upload/uploader.jsx

@@ -63,8 +63,7 @@ export function Uploader({ onChange, ...props }) {
     templateDownloadText = "模板下载",
     isFileObj = false,
     isFileJson = false,
-    thumbnailParams = "image_process=resize,w_200",
-    selfUrlList = ["https://self-oss.abt.hzabjt.com"],
+    thumbnailParams = { image_process: "resize,w_200" },
     readPretty,
   } = props;
   const isPrivateStore =
@@ -136,7 +135,7 @@ export function Uploader({ onChange, ...props }) {
   };
 
   useEffect(() => {
-    const list = handleInputFileList(value, { ...fileListConf, maxCount, previewConfig, thumbnailParams, selfUrlList });
+    const list = handleInputFileList(value, { ...fileListConf, maxCount, previewConfig, thumbnailParams });
 
     async function handlePreview() {
       await handlePreviewUrls(list, {

package/src/index.tsx

@@ -180,10 +180,12 @@ const FormRender = forwardRef((props: any, parentRef) => {
         onAutoSubmit={autoSubmit}
         onAutoSubmitFailed={autoSubmitFailed}
       >
-        <FormLayout {...formLayoutProps}>
-          <SchemaField schema={schema}></SchemaField>
-          <div className="form-render-footer xxm">{footer}</div>
-        </FormLayout>
+        <PreviewText.Placeholder value={props?.emptyValue}>
+          <FormLayout {...formLayoutProps}>
+            <SchemaField schema={schema}></SchemaField>
+            <div className="form-render-footer xxm">{footer}</div>
+          </FormLayout>
+        </PreviewText.Placeholder>
       </Form>
     </GlobalPropsContext.Provider>
   );