@hzab/form-render 1.6.17 → 1.6.19

package/src/components/ArrayTable/style.less

@@ -1,53 +1,53 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
-
-@array-table-prefix-cls: ~'@{ant-prefix}-formily-array-table';
-
-.@{array-table-prefix-cls} {
-  .@{array-table-prefix-cls}-pagination {
-    display: flex;
-    justify-content: center;
-
-    .@{array-table-prefix-cls}-status-select.has-error {
-      .@{ant-prefix}-select-selector {
-        border-color: @error-color !important;
-      }
-    }
-  }
-
-  .@{ant-prefix}-table {
-    table {
-      overflow: hidden;
-    }
-
-    td {
-      visibility: visible;
-
-      .@{ant-prefix}-formily-item:not(.@{ant-prefix}-formily-item-feedback-layout-popover) {
-        margin-bottom: 0 !important;
-
-        .@{ant-prefix}-formily-item-help {
-          position: absolute;
-          font-size: 12px;
-          top: 100%;
-          background: #fff;
-          width: 100%;
-          margin-top: 3px;
-          padding: 3px;
-          z-index: 1;
-          border-radius: 3px;
-          box-shadow: 0 0 10px #eee;
-          animation: none;
-          transform: translateY(0);
-          opacity: 1;
-        }
-      }
-    }
-  }
-
-  .@{array-table-prefix-cls}-sort-helper {
-    background: #fff;
-    border: 1px solid #eee;
-    z-index: 10;
-  }
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
+@array-table-prefix-cls: ~'@{ant-prefix}-formily-array-table';
+
+.@{array-table-prefix-cls} {
+  .@{array-table-prefix-cls}-pagination {
+    display: flex;
+    justify-content: center;
+
+    .@{array-table-prefix-cls}-status-select.has-error {
+      .@{ant-prefix}-select-selector {
+        border-color: @error-color !important;
+      }
+    }
+  }
+
+  .@{ant-prefix}-table {
+    table {
+      overflow: hidden;
+    }
+
+    td {
+      visibility: visible;
+
+      .@{ant-prefix}-formily-item:not(.@{ant-prefix}-formily-item-feedback-layout-popover) {
+        margin-bottom: 0 !important;
+
+        .@{ant-prefix}-formily-item-help {
+          position: absolute;
+          font-size: 12px;
+          top: 100%;
+          background: #fff;
+          width: 100%;
+          margin-top: 3px;
+          padding: 3px;
+          z-index: 1;
+          border-radius: 3px;
+          box-shadow: 0 0 10px #eee;
+          animation: none;
+          transform: translateY(0);
+          opacity: 1;
+        }
+      }
+    }
+  }
+
+  .@{array-table-prefix-cls}-sort-helper {
+    background: #fff;
+    border: 1px solid #eee;
+    z-index: 10;
+  }
 }

package/src/components/ArrayTable/style.ts

@@ -1,7 +1,7 @@
-import 'antd/lib/table/style/index'
-import 'antd/lib/button/style/index'
-import 'antd/lib/select/style/index'
-import 'antd/lib/space/style/index'
-import 'antd/lib/badge/style/index'
-import 'antd/lib/pagination/style/index'
-import './style.less'
+import 'antd/lib/table/style/index'
+import 'antd/lib/button/style/index'
+import 'antd/lib/select/style/index'
+import 'antd/lib/space/style/index'
+import 'antd/lib/badge/style/index'
+import 'antd/lib/pagination/style/index'
+import './style.less'

package/src/components/DatePicker/index.tsx

@@ -1,108 +1,108 @@
-import { useField, useFieldSchema, connect, mapProps } from "@formily/react";
-import { DatePicker as AntdDatePicker } from "c-formily-antd";
-
-import { DatePickerProps, RangePickerProps } from "antd/lib/date-picker";
-
-import { getParentValue } from "../../common/formily-utils";
-import { dateable } from "../../common/date-utils";
-
-const { RangePicker } = AntdDatePicker;
-
-type DatePickerT = React.FC<any> & {
-  RangePicker?: React.FC<any>;
-};
-
-const handleProps = (props: DatePickerProps) => {
-  const getDefaultFormat = (props: DatePickerProps) => {
-    if (props["picker"] === "month") {
-      return "YYYY-MM";
-    } else if (props["picker"] === "quarter") {
-      return "YYYY-\\QQ";
-    } else if (props["picker"] === "year") {
-      return "YYYY";
-    } else if (props["picker"] === "week") {
-      return "gggg-wo";
-    }
-    return props["showTime"] ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD";
-  };
-  const format = props["format"] || (getDefaultFormat(props) as any);
-
-  return {
-    ...props,
-    format,
-    value: dateable(props.value, format === "gggg-wo" ? "gggg-ww" : format),
-  };
-};
-
-export const DatePicker: DatePickerT = connect(
-  AntdDatePicker,
-  mapProps((props: any) => {
-    const datePickerProps = handleProps(props);
-    return datePickerProps;
-  }),
-);
-
-DatePicker.RangePicker = connect(
-  (props: any) => {
-    const field: any = useField();
-    const fieldSchema = useFieldSchema();
-    const {
-      /**
-     *
-    isSplitTimes
-      true: 拆分为 startKey和 endKey 两个字段
-      false: 不做拆分
-     */
-      isSplitTimes = false,
-      startKey = "startTime",
-      endKey = "endTime",
-    } = props;
-
-    const handleOnConfirm = (startTime, endTime) => {
-      const res = {
-        [startKey]: startTime,
-        [endKey]: endTime,
-      };
-
-      if (!field.parent) {
-        field.form.setValues(res);
-      } else if (field.parent && fieldSchema.parent) {
-        // 嵌套在 ArrayBase: ArrayTable ArrayCard 等 里面的情况
-        const parentVal = getParentValue(field);
-        Object.keys(res).forEach((key) => {
-          parentVal[key] = res[key];
-        });
-      }
-    };
-
-    const handleOnChange = (dates, dateStrings) => {
-      props.onChange && props.onChange(dates);
-      if (!isSplitTimes) return;
-      if (!dates || !dates.length) {
-        handleOnConfirm(undefined, undefined);
-        return;
-      }
-
-      const startTime = dates[0];
-      const endTime = dates[1];
-      if ((props.pick === "date" || !props.pick) && !props.showTime) {
-        handleOnConfirm(startTime + " 00:00:00", endTime + " 23:59:59");
-        return;
-      }
-      handleOnConfirm(startTime, endTime);
-    };
-
-    return (
-      <RangePicker
-        {...props}
-        onChange={(
-          value: DatePickerProps["value"] | RangePickerProps["value"],
-          dateString: [string, string] | string,
-        ) => handleOnChange(value, dateString)}
-      />
-    );
-  },
-  mapProps((props: any) => {
-    return handleProps(props);
-  }),
-);
+import { useField, useFieldSchema, connect, mapProps } from "@formily/react";
+import { DatePicker as AntdDatePicker } from "c-formily-antd";
+
+import { DatePickerProps, RangePickerProps } from "antd/lib/date-picker";
+
+import { getParentValue } from "../../common/formily-utils";
+import { dateable } from "../../common/date-utils";
+
+const { RangePicker } = AntdDatePicker;
+
+type DatePickerT = React.FC<any> & {
+  RangePicker?: React.FC<any>;
+};
+
+const handleProps = (props: DatePickerProps) => {
+  const getDefaultFormat = (props: DatePickerProps) => {
+    if (props["picker"] === "month") {
+      return "YYYY-MM";
+    } else if (props["picker"] === "quarter") {
+      return "YYYY-\\QQ";
+    } else if (props["picker"] === "year") {
+      return "YYYY";
+    } else if (props["picker"] === "week") {
+      return "gggg-wo";
+    }
+    return props["showTime"] ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD";
+  };
+  const format = props["format"] || (getDefaultFormat(props) as any);
+
+  return {
+    ...props,
+    format,
+    value: dateable(props.value, format === "gggg-wo" ? "gggg-ww" : format),
+  };
+};
+
+export const DatePicker: DatePickerT = connect(
+  AntdDatePicker,
+  mapProps((props: any) => {
+    const datePickerProps = handleProps(props);
+    return datePickerProps;
+  }),
+);
+
+DatePicker.RangePicker = connect(
+  (props: any) => {
+    const field: any = useField();
+    const fieldSchema = useFieldSchema();
+    const {
+      /**
+     *
+    isSplitTimes
+      true: 拆分为 startKey和 endKey 两个字段
+      false: 不做拆分
+     */
+      isSplitTimes = false,
+      startKey = "startTime",
+      endKey = "endTime",
+    } = props;
+
+    const handleOnConfirm = (startTime, endTime) => {
+      const res = {
+        [startKey]: startTime,
+        [endKey]: endTime,
+      };
+
+      if (!field.parent) {
+        field.form.setValues(res);
+      } else if (field.parent && fieldSchema.parent) {
+        // 嵌套在 ArrayBase: ArrayTable ArrayCard 等 里面的情况
+        const parentVal = getParentValue(field);
+        Object.keys(res).forEach((key) => {
+          parentVal[key] = res[key];
+        });
+      }
+    };
+
+    const handleOnChange = (dates, dateStrings) => {
+      props.onChange && props.onChange(dates);
+      if (!isSplitTimes) return;
+      if (!dates || !dates.length) {
+        handleOnConfirm(undefined, undefined);
+        return;
+      }
+
+      const startTime = dates[0];
+      const endTime = dates[1];
+      if ((props.pick === "date" || !props.pick) && !props.showTime) {
+        handleOnConfirm(startTime + " 00:00:00", endTime + " 23:59:59");
+        return;
+      }
+      handleOnConfirm(startTime, endTime);
+    };
+
+    return (
+      <RangePicker
+        {...props}
+        onChange={(
+          value: DatePickerProps["value"] | RangePickerProps["value"],
+          dateString: [string, string] | string,
+        ) => handleOnChange(value, dateString)}
+      />
+    );
+  },
+  mapProps((props: any) => {
+    return handleProps(props);
+  }),
+);

package/src/components/LocationListPicker/assets/icon.js

@@ -1 +1 @@
-export const iconCircle0080ff = `data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJQSURBVGhD3ZrrdcIwDIVldw26R+kesEdZALJA2QMGgT3KGq2razk4cV4OSYPd7w92yznRtSUrslA0B3uzohd6pW/a8OyNFI+JVvZ/nhsZutiRpjPt1dmOJzJNQGE2bNQnj0Jj4zAsZKKY8QKw2sRGK7va82HoSIXauVk04wQU5sOt+N+haMc7cnSzQeIEYNWV9d/HXGUsEitb3pGb/KEb7T67gZ8r+uLRMsYDRWv7TDx7gH4B4jInN1sePBs29NDtQkv4eyw9cdEuQI7H5618G4pjouW4bQqQgIXPp4fhBBkEdlsMpLXyVeQkrFEXAL/HCZAuqzCo6y50MMaN0qbiSn4H9iaNEyeOu61egKLe8zYpKu9hIiAi4yWHs1kE/Mz8ZrkELslKEOcSvCEczDpL9ynhKlBn6T4lXMLWE1l+vOnEM28/Ci60ZKEyP6vcXSh4mcuQfyFgsPJPmJvmbJZm9RWDoQt24CqzPNGcjme5ZH0Kms6a03G+LrRXLEBKs/wCGTfbjByjuDjKDVzLM76oz60mOChru09kbkuyAL0Eh9+BlG/kQtzqA78DCOYcYiGw0e9AycEs2wsYAxofhXp3M4vfgRKTdIGzdZ93mgLElRpffDqwKbiZBk0BAPfwKcWDNDhaT8lmDFRJoUsjxnd2LfsFgGd2azq6MlWGBQBpbp/420sFOH6WsG7z+ZA4ASVLuNSAy4SME1CCXsLc1/HyKrOLWfUqjwkoQXzgavLx301I9h/w8z6mCahSigESK2E2h18jy19tFYhCauRqNyH6BUPQrVUSJvRPAAAAAElFTkSuQmCC`;
+export const iconCircle0080ff = `data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJQSURBVGhD3ZrrdcIwDIVldw26R+kesEdZALJA2QMGgT3KGq2razk4cV4OSYPd7w92yznRtSUrslA0B3uzohd6pW/a8OyNFI+JVvZ/nhsZutiRpjPt1dmOJzJNQGE2bNQnj0Jj4zAsZKKY8QKw2sRGK7va82HoSIXauVk04wQU5sOt+N+haMc7cnSzQeIEYNWV9d/HXGUsEitb3pGb/KEb7T67gZ8r+uLRMsYDRWv7TDx7gH4B4jInN1sePBs29NDtQkv4eyw9cdEuQI7H5618G4pjouW4bQqQgIXPp4fhBBkEdlsMpLXyVeQkrFEXAL/HCZAuqzCo6y50MMaN0qbiSn4H9iaNEyeOu61egKLe8zYpKu9hIiAi4yWHs1kE/Mz8ZrkELslKEOcSvCEczDpL9ynhKlBn6T4lXMLWE1l+vOnEM28/Ci60ZKEyP6vcXSh4mcuQfyFgsPJPmJvmbJZm9RWDoQt24CqzPNGcjme5ZH0Kms6a03G+LrRXLEBKs/wCGTfbjByjuDjKDVzLM76oz60mOChru09kbkuyAL0Eh9+BlG/kQtzqA78DCOYcYiGw0e9AycEs2wsYAxofhXp3M4vfgRKTdIGzdZ93mgLElRpffDqwKbiZBk0BAPfwKcWDNDhaT8lmDFRJoUsjxnd2LfsFgGd2azq6MlWGBQBpbp/420sFOH6WsG7z+ZA4ASVLuNSAy4SME1CCXsLc1/HyKrOLWfUqjwkoQXzgavLx301I9h/w8z6mCahSigESK2E2h18jy19tFYhCauRqNyH6BUPQrVUSJvRPAAAAAElFTkSuQmCC`;

package/src/components/LocationListPicker/components/AddrList/index.less

@@ -1,55 +1,55 @@
-.addr-list {
-  flex: 1;
-  height: 100%;
-  min-height: 600px;
-  overflow-y: auto;
-  .addr-item {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 12px 24px;
-    line-height: 1;
-    cursor: pointer;
-
-    &.active {
-      background: #f2f9ff;
-      border: 1px solid #0080ff;
-    }
-
-    .addr-item-content {
-      flex: 1;
-      width: 100%;
-    }
-
-    .item-content {
-      display: flex;
-      .item-addr {
-      }
-      .item-range {
-        flex-shrink: 0;
-        color: #999;
-      }
-    }
-
-    .action-box {
-      min-width: 56px;
-    }
-    .action-btn {
-      margin-right: 12px;
-      font-size: 16px;
-      &:last-child {
-        margin-right: none;
-      }
-      &.disabled {
-        color: #999;
-        cursor: not-allowed;
-      }
-    }
-    .edit-btn {
-      color: #0080ff;
-    }
-    .del-btn {
-      color: #ff3333;
-    }
-  }
-}
+.addr-list {
+  flex: 1;
+  height: 100%;
+  min-height: 600px;
+  overflow-y: auto;
+  .addr-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 12px 24px;
+    line-height: 1;
+    cursor: pointer;
+
+    &.active {
+      background: #f2f9ff;
+      border: 1px solid #0080ff;
+    }
+
+    .addr-item-content {
+      flex: 1;
+      width: 100%;
+    }
+
+    .item-content {
+      display: flex;
+      .item-addr {
+      }
+      .item-range {
+        flex-shrink: 0;
+        color: #999;
+      }
+    }
+
+    .action-box {
+      min-width: 56px;
+    }
+    .action-btn {
+      margin-right: 12px;
+      font-size: 16px;
+      &:last-child {
+        margin-right: none;
+      }
+      &.disabled {
+        color: #999;
+        cursor: not-allowed;
+      }
+    }
+    .edit-btn {
+      color: #0080ff;
+    }
+    .del-btn {
+      color: #ff3333;
+    }
+  }
+}

package/src/components/LocationListPicker/components/AddrList/index.tsx

@@ -1,75 +1,75 @@
-import { Popconfirm } from "antd";
-import { EditOutlined, DeleteOutlined } from "@ant-design/icons";
-
-import "./index.less";
-import { useState } from "react";
-
-export const AddrList = (props) => {
-  const {
-    readOnly,
-    disabled,
-    list,
-    ItemRender,
-    onItemClick,
-    onEdit,
-    onDel,
-    hasAction = true,
-    activeId,
-    onDelClick,
-    onDelCancel,
-  } = props;
-
-  const CItemRender = ItemRender ?? LItemRender;
-
-  return (
-    <div className="addr-list">
-      {list?.map((it, i) => {
-        const delCom = (
-          <DeleteOutlined
-            className={`action-btn del-btn ${disabled ? "disabled" : ""}`}
-            onClick={(e) => !disabled && onDelClick && onDelClick(it, i, e)}
-          />
-        );
-        return (
-          <div className={`addr-item ${activeId === it.id ? "active" : ""}`} key={it.id ?? i}>
-            <div className="addr-item-content" onClick={(e) => onItemClick(it, i, e)}>
-              <CItemRender item={it} index={i} />
-            </div>
-            {!readOnly && hasAction && (
-              <div className="action-box">
-                <EditOutlined
-                  className={`action-btn edit-btn ${disabled ? "disabled" : ""}`}
-                  onClick={(e) => !disabled && onEdit && onEdit(it, i, e)}
-                />
-                {disabled ? (
-                  delCom
-                ) : (
-                  <Popconfirm
-                    title={"确认删除当前项？"}
-                    onConfirm={(e) => onDel && onDel(it, i, e)}
-                    onOpenChange={(open) => open === false && onDelCancel && onDelCancel(it, i)}
-                  >
-                    {delCom}
-                  </Popconfirm>
-                )}
-              </div>
-            )}
-          </div>
-        );
-      })}
-    </div>
-  );
-};
-
-function LItemRender(props) {
-  const { item } = props;
-  const { address, range } = item || {};
-  return (
-    <div className="item-content">
-      <div className="item-addr">{address}</div>
-      {range && <span className="item-range">（范围：{range}）</span>}
-    </div>
-  );
-}
-
-export default AddrList;
+import { Popconfirm } from "antd";
+import { EditOutlined, DeleteOutlined } from "@ant-design/icons";
+
+import "./index.less";
+import { useState } from "react";
+
+export const AddrList = (props) => {
+  const {
+    readOnly,
+    disabled,
+    list,
+    ItemRender,
+    onItemClick,
+    onEdit,
+    onDel,
+    hasAction = true,
+    activeId,
+    onDelClick,
+    onDelCancel,
+  } = props;
+
+  const CItemRender = ItemRender ?? LItemRender;
+
+  return (
+    <div className="addr-list">
+      {list?.map((it, i) => {
+        const delCom = (
+          <DeleteOutlined
+            className={`action-btn del-btn ${disabled ? "disabled" : ""}`}
+            onClick={(e) => !disabled && onDelClick && onDelClick(it, i, e)}
+          />
+        );
+        return (
+          <div className={`addr-item ${activeId === it.id ? "active" : ""}`} key={it.id ?? i}>
+            <div className="addr-item-content" onClick={(e) => onItemClick(it, i, e)}>
+              <CItemRender item={it} index={i} />
+            </div>
+            {!readOnly && hasAction && (
+              <div className="action-box">
+                <EditOutlined
+                  className={`action-btn edit-btn ${disabled ? "disabled" : ""}`}
+                  onClick={(e) => !disabled && onEdit && onEdit(it, i, e)}
+                />
+                {disabled ? (
+                  delCom
+                ) : (
+                  <Popconfirm
+                    title={"确认删除当前项？"}
+                    onConfirm={(e) => onDel && onDel(it, i, e)}
+                    onOpenChange={(open) => open === false && onDelCancel && onDelCancel(it, i)}
+                  >
+                    {delCom}
+                  </Popconfirm>
+                )}
+              </div>
+            )}
+          </div>
+        );
+      })}
+    </div>
+  );
+};
+
+function LItemRender(props) {
+  const { item } = props;
+  const { address, range } = item || {};
+  return (
+    <div className="item-content">
+      <div className="item-addr">{address}</div>
+      {range && <span className="item-range">（范围：{range}）</span>}
+    </div>
+  );
+}
+
+export default AddrList;

package/src/components/LocationListPicker/components/Popup/address.schema.json

@@ -1,21 +1,21 @@
-{
-  "form": {},
-  "schema": {
-    "type": "object",
-    "properties": {
-      "address": {
-        "type": "string",
-        "title": "位置",
-        "x-decorator": "FormItem",
-        "x-component": "text",
-        "x-validator": [],
-        "x-component-props": {},
-        "x-decorator-props": {},
-        "x-designable-id": "address",
-        "name": "address",
-        "x-index": 0
-      }
-    },
-    "x-designable-id": "o6m980wykh1"
-  }
-}
+{
+  "form": {},
+  "schema": {
+    "type": "object",
+    "properties": {
+      "address": {
+        "type": "string",
+        "title": "位置",
+        "x-decorator": "FormItem",
+        "x-component": "text",
+        "x-validator": [],
+        "x-component-props": {},
+        "x-decorator-props": {},
+        "x-designable-id": "address",
+        "name": "address",
+        "x-index": 0
+      }
+    },
+    "x-designable-id": "o6m980wykh1"
+  }
+}