@hzab/form-render 1.5.0-beta3 → 1.5.0

package/CHANGELOG.md

@@ -1,5 +1,6 @@
 # @hzab/form-render@1.5.0
 
+feat: ossUpload 文件目录配置 dir 前缀 oss-upload 文件目录；dir 格式格式化
 feat: 上传组件多模式上传，出参格式配置
 fix: 字符串事件处理（onChange）
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/form-render",
-  "version": "1.5.0-beta3",
+  "version": "1.5.0",
   "description": "",
   "main": "src",
   "scripts": {

package/src/common/schema-handler.ts

@@ -14,7 +14,7 @@ export const nanoid = customAlphabet(alphabet, 20);
  *
  * 2. `$form` is the current Form Model
  *
- * 3. `$deps` is the dependencies value
+ * 3. `$deps` is the dependencies value 仅在 run 中存在
  *
  * 4. `$observable` function is used to create an persistent observable state object
  *
@@ -30,7 +30,7 @@ export const nanoid = customAlphabet(alphabet, 20);
  **/
 
 /** formily 执行函数作用域相关参数 */
-export const formilyDataKeys = ["$form", "$self", "$observable", "$effect", "$memo", "$props", "$values", "$deps"];
+export const formilyDataKeys = ["$form", "$self", "$observable", "$effect", "$memo", "$props", "$values"];
 
 /** 自增容器 */
 export const arrayList = ["ArrayTable", "ArrayCards"];
@@ -127,9 +127,9 @@ export const bindCallback = (opt) => {
   }
   // 设置一个唯一的函数名，用于从 schema scope 传入 formily 事件执行中
   const fnKey = "fnKey_" + nanoid();
-  // 设置 schemaScope 中的唯一函数,获取执行函数作用域 $form, $self, $observable, $effect, $memo, $props, $values, $deps 相关参数
+  // 设置 schemaScope 中的唯一函数,获取执行函数作用域 $form, $self, $observable, $effect, $memo, $props, $values 相关参数
   schemaScope._$tempData[fnKey] = function (params, sourceArgs) {
-    const { $form, $self, $observable, $effect, $memo, $props, $values, $deps } = params;
+    const { $form, $self, $observable, $effect, $memo, $props, $values } = params;
     // 处理结果数据，各组件返回数据格式不一致
     const res = handleChangeValue({
       ...opt,

package/src/components/LocationPicker/components/ModalContent/index.tsx

@@ -220,7 +220,6 @@ export const ModalContent = observer((props: any) => {
   function onClickMap(ev) {
     const { lng: evLon, lat: evLat } = ev.lnglat || {};
     if (element === "Polypoint") {
-      console.log(evLon, evLat);
       setPickPoint(evLon, evLat, { changeCenter: true });
     }
   }

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

@@ -3,8 +3,14 @@ import LUploadOss from "./ossUpload";
 export const getOfflineUploadRequest = (props) => {
   return ({ action, data, file, filename, headers, method, onSuccess, onProgress, onError }) => {
     // TODO: 处理请求逻辑
-    // file.ossPromise = ;
-    onSuccess(file);
+    file.ossPromise = new Promise((resolve) => {
+      resolve(file);
+    })
+      .then((file) => {
+        onSuccess(file);
+        return file;
+      })
+      .catch(onError);
   };
 };
 

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

@@ -7,6 +7,9 @@ import { nanoid } from "./nanoid";
  * @returns
  */
 export function getFileName(fileUrl) {
+  if (typeof fileUrl !== "string") {
+    return;
+  }
   const res = fileUrl?.match(/([^\/]+?)\.[^\/\.]+$/);
   if (res && res.length > 0) {
     return res?.[1] || res?.[0];
@@ -21,6 +24,9 @@ export function getFileName(fileUrl) {
  * @returns
  */
 export function getFullFileName(fileUrl) {
+  if (typeof fileUrl !== "string") {
+    return;
+  }
   const res = fileUrl?.match(/[^\/]+?\.[^\/\.]+$/);
   if (res && res.length > 0) {
     return res[0];
@@ -34,10 +40,13 @@ export function getFullFileName(fileUrl) {
  * @param {*} str
  * @returns
  */
-export const mergeFileName = function (fileName, str) {
+export const mergeFileName = function (fileName, str = "") {
+  if (typeof fileName !== "string") {
+    return "";
+  }
   const name = fileName?.match(/([^\/]+?)\.[^\/]+$/)?.[1] || "";
   const suffix = fileName?.match(/[^\/]+?\.([^\/]+)$/)?.[1] || "";
-  return `${name}${str}.${suffix}`;
+  return `${name}${str ?? ""}.${suffix}`;
 };
 
 /**

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

@@ -97,6 +97,9 @@ export const objStrToObj = function (objStr) {
  * @returns
  */
 export function mergePreviewConfig(uri, previewConfig) {
+  if (typeof uri !== "string") {
+    return uri;
+  }
   let _uri = uri?.trim();
   // base64 直接返回
   if (isBase64Str(_uri)) {

package/src/components/Upload/common/ossUpload.js

@@ -1,5 +1,6 @@
 import { axios } from "@hzab/data-model";
 import { getFileNameByFileObj } from "./fileName";
+import { formatDirStr, mergeDirStr } from "./utils";
 
 export function getSignature(opt = {}) {
   const { serverUrl = "/api/v1/user/oss/getWebOssConfig" } = opt;
@@ -12,6 +13,9 @@ export function getSignature(opt = {}) {
     return Promise.resolve(window.__ossSignatureRes);
   }
   const { axios: _ax = axios, params = {}, axiosConf } = opt;
+  // 处理 dir 格式，必须为非 / 开头， /  结尾。如： test/
+  params.dir = formatDirStr(params.dir);
+
   return _ax
     .get(serverUrl, {
       ...axiosConf,
@@ -39,6 +43,8 @@ class OssUpload {
   }
 
   getSignature(serverUrl = this.serverUrl, opt) {
+    // dir 前缀 oss-upload 文件目录
+    opt.params.dir = mergeDirStr("web-upload/", opt.params.dir);
     return getSignature({
       ...opt,
       serverUrl,

package/src/components/Upload/common/utils.js

@@ -1,5 +1,22 @@
 import { nanoid } from "nanoid";
 
+/**
+ * 格式化 dir 字符串，必须为非 / 开头， /  结尾。如： test/
+ * @param {*} dir
+ * @returns
+ */
+export const formatDirStr = function (dir) {
+  return dir?.replace(/^\/(.*)\/*$/, "$1").replace(/(.?=*)\/*$/, "$1/");
+};
+
+/**
+ * 合并 dir 字符串
+ * @param {*} dir
+ */
+export const mergeDirStr = function (dir1, dir2) {
+  return `${formatDirStr(dir1 || "")}${formatDirStr(dir2 || "")}`;
+};
+
 /**
  *  建立一个可以存取该 file 的 url
  * @param {Object} file 文件

package/src/components/Upload/uploader.jsx

@@ -102,7 +102,12 @@ export function Uploader({ onChange, ...props }) {
       let _file = _files[i]?.originFileObj || _files[i];
       if (!_file.url) {
         _file.url = (await _file.ossPromise) || _file.ossUrl || typeof _file === "string" ? _file : "";
-        _files[i].url = _file.url;
+        if (typeof _file.url === "string") {
+          _files[i].url = _file.url;
+        } else if (typeof _file?.url?.ossUrl === "string") {
+          _file.url = _file?.url?.ossUrl;
+          _files[i].url = _file?.url?.ossUrl;
+        }
       }
     }