@fle-ui/plus-dynamic-form 1.0.9 → 1.1.0

package/es/index.d.ts

@@ -9,8 +9,11 @@ interface DynamicFormProps extends ProFormProps {
     style: React.CSSProperties;
     request: () => Promise<Record<string, any>>;
 }
+declare const searchFormTypeToDynamicFormType: any;
+declare const searchFormTypeToDynamicFormTypeRender: any;
+declare const searchFormTypeToDynamicFormTypeSearch: any;
 declare const CreateDynamicFormList: (extList: any) => React.ReactNode[];
 declare const HocFormHooks: (WrapperComponent: any, settingsRequst: any) => Promise<any>;
 declare const _default: React.ForwardRefExoticComponent<DynamicFormProps & React.RefAttributes<DynamicFormRef>>;
 export default _default;
-export { CreateDynamicFormList, HocFormHooks };
+export { CreateDynamicFormList, HocFormHooks, searchFormTypeToDynamicFormType, searchFormTypeToDynamicFormTypeRender, searchFormTypeToDynamicFormTypeSearch, };

package/es/index.js

@@ -1,6 +1,6 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 import "antd/es/form/style";
 import _Form from "antd/es/form";
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -11,19 +11,53 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React, { useEffect, useRef, useState, useImperativeHandle } from 'react';
 import { ProForm, ProFormText, ProFormSelect, ProFormDatePicker, ProFormDateTimePicker } from '@ant-design/pro-components';
 import dayjs from 'dayjs';
 import _ from 'lodash';
+var searchFormTypeToDynamicFormType = {
+  date: 'dateRange',
+  input: 'text',
+  select: 'select',
+  multiSelect: 'select',
+  number: 'text'
+};
+var searchFormTypeToDynamicFormTypeRender = {
+  // 处理扩展字段复杂搜索
+  date: function date(text, record, key) {
+    return record[key];
+  },
+  input: function input(text, record, key) {
+    return record[key];
+  },
+  number: function number(text, record, key) {
+    return record[key];
+  },
+  select: function select(text, record, key) {
+    return record[key];
+  },
+  multiSelect: function multiSelect(text, record, key) {
+    return record[key];
+  }
+};
+var searchFormTypeToDynamicFormTypeSearch = {
+  // 实践类和数字类数字转换
+  number: function number(text, record, key) {
+    return _defineProperty({}, key, +text);
+  },
+  date: function date(text, record, key) {
+    return _defineProperty({}, key, [dayjs(text[0]).format('YYYY-MM-DD HH:mm:ss'), dayjs(text[1]).format('YYYY-MM-DD HH:mm:ss')]);
+  }
+};
 function PlusDynamicForm(props, ref) {
   var propsRequest = props.request,
     propsContainStyles = props.style;
@@ -83,7 +117,7 @@ function PlusDynamicForm(props, ref) {
     });
   });
   var init = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var res;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -101,7 +135,7 @@ function PlusDynamicForm(props, ref) {
       }, _callee2);
     }));
     return function init() {
-      return _ref.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   useEffect(function () {
@@ -311,7 +345,7 @@ var CreateDynamicFormList = function CreateDynamicFormList(extList) {
   return DyanmiceFormList;
 };
 var HocFormHooks = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(WrapperComponent, settingsRequst) {
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(WrapperComponent, settingsRequst) {
     var newWrapperComponent, settings;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
@@ -350,8 +384,8 @@ var HocFormHooks = /*#__PURE__*/function () {
     }, _callee3);
   }));
   return function HocFormHooks(_x, _x2) {
-    return _ref2.apply(this, arguments);
+    return _ref4.apply(this, arguments);
   };
 }();
 export default /*#__PURE__*/React.forwardRef(PlusDynamicForm);
-export { CreateDynamicFormList, HocFormHooks };
+export { CreateDynamicFormList, HocFormHooks, searchFormTypeToDynamicFormType, searchFormTypeToDynamicFormTypeRender, searchFormTypeToDynamicFormTypeSearch };

package/lib/index.d.ts

@@ -9,8 +9,11 @@ interface DynamicFormProps extends ProFormProps {
     style: React.CSSProperties;
     request: () => Promise<Record<string, any>>;
 }
+declare const searchFormTypeToDynamicFormType: any;
+declare const searchFormTypeToDynamicFormTypeRender: any;
+declare const searchFormTypeToDynamicFormTypeSearch: any;
 declare const CreateDynamicFormList: (extList: any) => React.ReactNode[];
 declare const HocFormHooks: (WrapperComponent: any, settingsRequst: any) => Promise<any>;
 declare const _default: React.ForwardRefExoticComponent<DynamicFormProps & React.RefAttributes<DynamicFormRef>>;
 export default _default;
-export { CreateDynamicFormList, HocFormHooks };
+export { CreateDynamicFormList, HocFormHooks, searchFormTypeToDynamicFormType, searchFormTypeToDynamicFormTypeRender, searchFormTypeToDynamicFormTypeSearch, };

package/lib/index.js

@@ -1,10 +1,9 @@
 "use strict";
 
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.HocFormHooks = exports.CreateDynamicFormList = void 0;
+exports.searchFormTypeToDynamicFormTypeSearch = exports.searchFormTypeToDynamicFormTypeRender = exports.searchFormTypeToDynamicFormType = exports.default = exports.HocFormHooks = exports.CreateDynamicFormList = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
 var _proComponents = require("@ant-design/pro-components");
@@ -13,6 +12,7 @@ var _lodash = _interopRequireDefault(require("lodash"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -23,15 +23,49 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+var searchFormTypeToDynamicFormType = exports.searchFormTypeToDynamicFormType = {
+  date: 'dateRange',
+  input: 'text',
+  select: 'select',
+  multiSelect: 'select',
+  number: 'text'
+};
+var searchFormTypeToDynamicFormTypeRender = exports.searchFormTypeToDynamicFormTypeRender = {
+  // 处理扩展字段复杂搜索
+  date: function date(text, record, key) {
+    return record[key];
+  },
+  input: function input(text, record, key) {
+    return record[key];
+  },
+  number: function number(text, record, key) {
+    return record[key];
+  },
+  select: function select(text, record, key) {
+    return record[key];
+  },
+  multiSelect: function multiSelect(text, record, key) {
+    return record[key];
+  }
+};
+var searchFormTypeToDynamicFormTypeSearch = exports.searchFormTypeToDynamicFormTypeSearch = {
+  // 实践类和数字类数字转换
+  number: function number(text, record, key) {
+    return _defineProperty({}, key, +text);
+  },
+  date: function date(text, record, key) {
+    return _defineProperty({}, key, [(0, _dayjs.default)(text[0]).format('YYYY-MM-DD HH:mm:ss'), (0, _dayjs.default)(text[1]).format('YYYY-MM-DD HH:mm:ss')]);
+  }
+};
 function PlusDynamicForm(props, ref) {
   var propsRequest = props.request,
     propsContainStyles = props.style;
@@ -91,7 +125,7 @@ function PlusDynamicForm(props, ref) {
     });
   });
   var init = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var res;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -109,7 +143,7 @@ function PlusDynamicForm(props, ref) {
       }, _callee2);
     }));
     return function init() {
-      return _ref.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   (0, _react.useEffect)(function () {
@@ -319,7 +353,7 @@ var CreateDynamicFormList = exports.CreateDynamicFormList = function CreateDynam
   return DyanmiceFormList;
 };
 var HocFormHooks = exports.HocFormHooks = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(WrapperComponent, settingsRequst) {
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(WrapperComponent, settingsRequst) {
     var newWrapperComponent, settings;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
@@ -358,7 +392,7 @@ var HocFormHooks = exports.HocFormHooks = /*#__PURE__*/function () {
     }, _callee3);
   }));
   return function HocFormHooks(_x, _x2) {
-    return _ref2.apply(this, arguments);
+    return _ref4.apply(this, arguments);
   };
 }();
 var _default = exports.default = /*#__PURE__*/_react.default.forwardRef(PlusDynamicForm);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fle-ui/plus-dynamic-form",
-  "version": "1.0.9",
+  "version": "1.1.0",
   "description": "@fle-ui/plus-dynamic-form",
   "author": "liqing19931031 <liqing@qq.com>",
   "homepage": "",