@hzab/form-render-mobile 0.0.6 → 0.0.7

package/README.md

@@ -2,7 +2,7 @@
 
 组件模板
 
-- node@14.21
+- node@16.x
 
 # 组件
 

package/lib/index.js

@@ -22500,7 +22500,7 @@
     return (
       (() => {
         "use strict";
-        o.r(s), o.d(s, { default: () => Fw });
+        o.r(s), o.d(s, { default: () => Ww });
         var e = {};
         function t(e) {
           return (
@@ -40635,8 +40635,8 @@
                             Promise.all(c).then(function (e) {
                               return (
                                 null == e ||
-                                  e.forEach(function (e) {
-                                    r.ossUrl = e;
+                                  e.forEach(function (e, t) {
+                                    r[t].ossUrl = e;
                                   }),
                                 Promise.resolve(r)
                               );
@@ -40850,16 +40850,17 @@
               capture: e.capture,
             }),
             k.map(function (e, t) {
-              var n = e,
-                r = n.type,
-                a = n.name,
-                i = n.url,
-                o = "",
+              var n = e;
+              "string" == typeof n && (n = { url: n, name: n });
+              var r = n,
+                a = r.type,
+                i = r.name,
+                o = r.url,
                 l = "",
-                u = void 0;
-              if ("string" == typeof e || i) {
-                o = i || e;
-                var c = (function (e) {
+                u = "",
+                c = void 0;
+              if (o) {
+                var d = (function (e) {
                   return lb(e, [
                     "apng",
                     "avif",
@@ -40878,32 +40879,32 @@
                     "tiff",
                     "webp",
                   ]);
-                })((e = i || e));
-                (e.startsWith("data:image/") || (/[ ,]?image\//.test(s) && c) || c) && (l = aw),
+                })((l = o));
+                (n.startsWith("data:image/") || (/[ ,]?image\//.test(s) && d) || d) && (u = aw),
                   /[ ,]?video\//.test(s) &&
                     (function (e) {
                       return lb(e, ["3gp", "mpg", "mpeg", "mp4", "m4v", "m4p", "ogv", "ogg", "mov", "webm"]);
-                    })(e) &&
-                    (l = rw),
+                    })(l) &&
+                    (u = rw),
                   /[ ,]?audio\//.test(s) &&
                     (function (e) {
                       return lb(e, ["3gp", "adts", "mpeg", "mp3", "mp4", "ogg", "mov", "webm", "rtp", "amr", "wav"]);
-                    })(e) &&
-                    (l = iw);
-              } else null != r && r.startsWith("image/") && ((o = sb(e)), (l = aw)), null != r && r.startsWith("video/") && ((o = sb(e)), (l = rw), (u = o)), null != r && r.startsWith("audio/") && ((o = sb(e)), (l = iw), (u = o));
+                    })(l) &&
+                    (u = iw);
+              } else null != a && a.startsWith("image/") && ((l = sb(l)), (u = aw)), null != a && a.startsWith("video/") && ((l = sb(l)), (u = rw), (c = l)), null != a && a.startsWith("audio/") && ((l = sb(l)), (u = iw), (c = l));
               return (
-                m && (o = m + o),
-                l === aw
+                m && (l = m + l),
+                u === aw
                   ? ew.createElement(
                       j,
-                      { index: t, key: a + "_" + t },
-                      ew.createElement(ab, { className: "file-item-view", src: o, alt: a }),
+                      { index: t, key: i + "_" + t },
+                      ew.createElement(ab, { className: "file-item-view", src: l, alt: i }),
                     )
-                  : l === rw
-                  ? ew.createElement(j, { index: t, key: a + "_" + t }, ew.createElement(eb, { src: o, href: u }))
-                  : l === iw
-                  ? ew.createElement("audio", { src: o, controls: !0 })
-                  : e.name
+                  : u === rw
+                  ? ew.createElement(j, { index: t, key: i + "_" + t }, ew.createElement(eb, { src: l, href: c }))
+                  : u === iw
+                  ? ew.createElement("audio", { src: l, controls: !0 })
+                  : n.name
               );
             }),
             l || u || (!n && k.length > 0) || (h > 0 && k.length >= h)
@@ -41754,21 +41755,35 @@
           }
           return e;
         }
-        var Nw = {
-          type: "object",
-          properties: {
-            formLayout_tfsvvph1s7i: {
-              type: "void",
-              "x-component": "FormLayout",
-              "x-component-props": { layout: "vertical" },
-              "x-designable-id": "formLayout_tfsvvph1s7i",
-              "x-index": 0,
-              properties: {},
-            },
-          },
-          "x-designable-id": "ndi5r4fw9jd",
-        };
+        function Nw(e) {
+          var t = Aw().cloneDeep(e),
+            n = t.schema || t,
+            r = t.form || {};
+          return (
+            r.layout || (r.layout = "horizontal"),
+            zw(n.properties, r.layout),
+            (t = Rw(Rw({}, e), {}, { form: r, schema: n }))
+          );
+        }
         function zw(e, t) {
+          var n = e && Object.keys(e);
+          return (
+            n &&
+              n.length > 0 &&
+              n.forEach(function (n) {
+                var r,
+                  a,
+                  i = e[n];
+                (i["x-decorator-props"] || (i["x-decorator-props"] = {}),
+                i["x-decorator-props"].layout || (i["x-decorator-props"].layout = t),
+                null != i && i.properties && zw(null == i ? void 0 : i.properties, t),
+                null != i && null !== (r = i.items) && void 0 !== r && r.properties) &&
+                  zw(null == i || null === (a = i.items) || void 0 === a ? void 0 : a.properties, t);
+              }),
+            e
+          );
+        }
+        function Iw(e, t) {
           var n = Object.keys(e);
           if (Object.getOwnPropertySymbols) {
             var r = Object.getOwnPropertySymbols(e);
@@ -41780,29 +41795,29 @@
           }
           return n;
         }
-        function Iw(e) {
+        function Fw(e) {
           for (var t = 1; t < arguments.length; t++) {
             var n = null != arguments[t] ? arguments[t] : {};
             t % 2
-              ? zw(Object(n), !0).forEach(function (t) {
+              ? Iw(Object(n), !0).forEach(function (t) {
                   r(e, t, n[t]);
                 })
               : Object.getOwnPropertyDescriptors
               ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(n))
-              : zw(Object(n)).forEach(function (t) {
+              : Iw(Object(n)).forEach(function (t) {
                   Object.defineProperty(e, t, Object.getOwnPropertyDescriptor(n, t));
                 });
           }
           return e;
         }
-        const Fw = (0, a.forwardRef)(function (t, n) {
+        const Ww = (0, a.forwardRef)(function (t, n) {
           var r = (0, a.useMemo)(function () {
               return (0,
-              zm.createSchemaField)({ components: Iw(Iw({ FormItem: Zm, FormLayout: Hm, CascadePicker: rg, CheckList: cy, Slider: Td, Checkbox: uy, DatePicker: tg, FormGrid: Ep, Input: iy, List: $y, Selector: oy, Stepper: dy, Switch: Zy, FormButtonGroup: s_, Submit: fy, Reset: hy }, e), t.components), scope: Iw({}, t.schemaScope) });
+              zm.createSchemaField)({ components: Fw(Fw({ FormItem: Zm, FormLayout: Hm, CascadePicker: rg, CheckList: cy, Slider: Td, Checkbox: uy, DatePicker: tg, FormGrid: Ep, Input: iy, List: $y, Selector: oy, Stepper: dy, Switch: Zy, FormButtonGroup: s_, Submit: fy, Reset: hy, Card: vo }, e), t.components), scope: Fw({}, t.schemaScope) });
             }, []),
             o = (0, a.useMemo)(function () {
               return (0,
-              Nm.createForm)(Iw({ initialValues: t.initialValues, readOnly: t.readOnly, disabled: t.disabled }, t.formOptions || {}));
+              Nm.createForm)(Fw({ initialValues: t.initialValues, readOnly: t.readOnly, disabled: t.disabled }, t.formOptions || {}));
             }, []);
           (0, a.useImperativeHandle)(n, function () {
             return { formRender: o };
@@ -41812,27 +41827,7 @@
             }, []);
           var s = (0, a.useMemo)(
             function () {
-              return (function (e) {
-                var t = Aw().cloneDeep(e),
-                  n = t.schema || t,
-                  r = t.form || {};
-                if ((r.layout || (r.layout = "horizontal"), n.properties && Object.keys(n.properties).length > 0)) {
-                  var a = Object.keys(n.properties)[0];
-                  if ("FormLayout" !== n.properties[a]["x-component"]) {
-                    var i = Aw().cloneDeep(Nw);
-                    r &&
-                      (i.properties.formLayout_tfsvvph1s7i["x-component-props"]
-                        ? (i.properties.formLayout_tfsvvph1s7i["x-component-props"] = Rw(
-                            Rw({}, i.properties.formLayout_tfsvvph1s7i["x-component-props"]),
-                            r,
-                          ))
-                        : (i.properties.formLayout_tfsvvph1s7i["x-component-props"] = Aw().cloneDeep(r))),
-                      (i.properties.formLayout_tfsvvph1s7i.properties = n.properties),
-                      (n = i);
-                  }
-                }
-                return { form: r, schema: n };
-              })(t.schema).schema;
+              return Nw(t.schema).schema;
             },
             [t.schema],
           );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/form-render-mobile",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "formily-form-render-mobile",
   "main": "lib",
   "scripts": {

package/src/common/schemaHandler.js

@@ -1,22 +1,5 @@
 import _ from "lodash";
 
-export const formLayoutTPL = {
-  type: "object",
-  properties: {
-    formLayout_tfsvvph1s7i: {
-      type: "void",
-      "x-component": "FormLayout",
-      "x-component-props": {
-        layout: "vertical",
-      },
-      "x-designable-id": "formLayout_tfsvvph1s7i",
-      "x-index": 0,
-      properties: {},
-    },
-  },
-  "x-designable-id": "ndi5r4fw9jd",
-};
-
 export function schemaHandler(_schema) {
   let formSchema = _.cloneDeep(_schema);
   let schema = formSchema.schema || formSchema;
@@ -26,30 +9,36 @@ export function schemaHandler(_schema) {
     formConf.layout = "horizontal";
   }
 
-  if (schema.properties && Object.keys(schema.properties).length > 0) {
-    const key = Object.keys(schema.properties)[0];
-    // 手动添加 FormLayout
-    if (schema.properties[key]["x-component"] !== "FormLayout") {
-      const _s = _.cloneDeep(formLayoutTPL);
-      if (formConf) {
-        if (!_s.properties.formLayout_tfsvvph1s7i["x-component-props"]) {
-          _s.properties.formLayout_tfsvvph1s7i["x-component-props"] = _.cloneDeep(formConf);
-        } else {
-          _s.properties.formLayout_tfsvvph1s7i["x-component-props"] = {
-            ..._s.properties.formLayout_tfsvvph1s7i["x-component-props"],
-            ...formConf,
-          };
-        }
-      }
-      _s.properties.formLayout_tfsvvph1s7i.properties = schema.properties;
-      schema = _s;
-    }
-  }
+  handleLayout(schema.properties, formConf.layout);
 
   formSchema = {
+    ..._schema,
     form: formConf,
     schema: schema,
   };
 
   return formSchema;
 }
+
+export function handleLayout(properties, layout) {
+  const keys = properties && Object.keys(properties);
+  if (keys && keys.length > 0) {
+    // 手动设置 FormLayout
+    keys.forEach((key) => {
+      const field = properties[key];
+      if (!field["x-decorator-props"]) {
+        field["x-decorator-props"] = {};
+      }
+      if (!field["x-decorator-props"].layout) {
+        field["x-decorator-props"].layout = layout;
+      }
+      if (field?.properties) {
+        handleLayout(field?.properties, layout);
+      }
+      if (field?.items?.properties) {
+        handleLayout(field?.items?.properties, layout);
+      }
+    });
+  }
+  return properties;
+}

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

@@ -122,8 +122,8 @@ export async function handleOssUpload(files, opt) {
   });
 
   return Promise.all(promise).then((filePromises) => {
-    filePromises?.forEach((fileUrl) => {
-      _files.ossUrl = fileUrl;
+    filePromises?.forEach((fileUrl, idx) => {
+      _files[idx].ossUrl = fileUrl;
     });
     return Promise.resolve(_files);
   });

package/src/components/Uploader/uploader.jsx

@@ -193,45 +193,52 @@ function Uploader(props) {
         accept={curAccept}
         capture={props.capture}
       ></input>
-      {fileList.map((it, idx) => {
+      {fileList.map((_it, idx) => {
+        let it = _it;
+        // 数据兼容处理
+        if (typeof it === "string") {
+          it = {
+            url: it,
+            name: it,
+          };
+        }
         const { type, name, url } = it;
         let src = "";
         let fileType = "";
         let downLoadUrl = undefined;
 
         // 判断文件类型，获取对应展示的数据
-        if (typeof it === "string" || url) {
-          src = url ? url : it;
-          it = url ? url : it;
+        if (url) {
+          src = url;
           // 图片
-          const isImg = checkImageUrl(it);
+          const isImg = checkImageUrl(src);
           if (it.startsWith("data:image/") || (/[ ,]?image\//.test(accept) && isImg) || isImg) {
             fileType = TYPE_IMG;
           }
           // 视频
-          if (/[ ,]?video\//.test(accept) && checkVideoUrl(it)) {
+          if (/[ ,]?video\//.test(accept) && checkVideoUrl(src)) {
             fileType = TYPE_VIDEO;
           }
           // 音频
-          if (/[ ,]?audio\//.test(accept) && checkAudioUrl(it)) {
+          if (/[ ,]?audio\//.test(accept) && checkAudioUrl(src)) {
             fileType = TYPE_AUDIO;
           }
         } else {
           // 图片
           if (type?.startsWith("image/")) {
-            src = getFileURL(it);
+            src = getFileURL(src);
             fileType = TYPE_IMG;
           }
 
           // 视频
           if (type?.startsWith("video/")) {
-            src = getFileURL(it);
+            src = getFileURL(src);
             fileType = TYPE_VIDEO;
             // TODO: 确认下载逻辑
             downLoadUrl = src;
           }
           if (type?.startsWith("audio/")) {
-            src = getFileURL(it);
+            src = getFileURL(src);
             fileType = TYPE_AUDIO;
             // TODO: 确认下载逻辑
             downLoadUrl = src;

package/src/index.tsx

@@ -17,7 +17,7 @@ import {
   Submit,
   Reset,
 } from "@formily/antd-mobile";
-import { Slider } from "antd-mobile";
+import { Card, Slider } from "antd-mobile";
 import { createForm } from "@formily/core";
 import { FormProvider, createSchemaField, Schema } from "@formily/react";
 
@@ -48,6 +48,7 @@ const FormRender = forwardRef((props: formPropsI, parentRef) => {
           FormButtonGroup,
           Submit,
           Reset,
+          Card,
           ...customComponents,
           ...props.components,
         },

package/src/type.d.ts

@@ -8,7 +8,7 @@ export interface formPropsI {
   /** 表单初始值 */
   initialValues?: Object;
   /** 表单 schema */
-  schema: { schema: Object } | Object;
+  schema: any;
   /** formily scope 自定义数据 */
   schemaScope?: Object;
   /** formily 自定义组件 */