@ztocwst/rc-pro-materials 0.2.3 → 0.2.5

package/es/components/z-config-provider/configProvider.js

@@ -1,18 +1,39 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 var _excluded = ["children"],
-  _excluded2 = ["authBtns", "singleWarehouseConfig", "singleFactoryConfig"];
+  _excluded2 = ["authBtns", "singleWarehouseConfig", "singleFactoryConfig", "asyncSelect", "form", "ossConfig", "print", "tableOptions", "tplOptions"];
 import * as React from 'react';
 import { RcConfigProvider } from '@ztocwst/rc-pro';
-import { processRequestConfig } from "../../utils/props/common";
+import { processEmptyObject, processRequestConfig } from "../../utils/props/common";
 var ZConfigProvider = function ZConfigProvider(_ref) {
+  var _singleWarehouseConfi, _singleFactoryConfig$, _asyncSelect$fieldNam, _asyncSelect$pager, _form$footer, _print$printer, _tableOptions$paginat, _tableOptions$sortNam;
   var children = _ref.children,
     rest = _objectWithoutPropertiesLoose(_ref, _excluded);
   var _rest$authBtns = rest.authBtns,
     authBtns = _rest$authBtns === void 0 ? [] : _rest$authBtns,
     singleWarehouseConfig = rest.singleWarehouseConfig,
     singleFactoryConfig = rest.singleFactoryConfig,
+    asyncSelect = rest.asyncSelect,
+    form = rest.form,
+    ossConfig = rest.ossConfig,
+    print = rest.print,
+    tableOptions = rest.tableOptions,
+    tplOptions = rest.tplOptions,
     restProps = _objectWithoutPropertiesLoose(rest, _excluded2);
+
+  /**
+   *
+   * 过滤空对象，如果对象中的值都是undefined，整个对象赋值 undefined
+   * asyncSelect 中的 fieldNames、pager 对象
+   * form 中的 footer对象
+   * ossConfig 对象
+   * print 中的 printer
+   * tableOptions 中的 pagination、sortNames
+   * tplOptions 对象
+   * singleWarehouseConfig 中 defaultConfig
+   * singleFactoryConfig 中 defaultConfig
+   */
+
   var props = _extends({
     authBtns: authBtns === null || authBtns === void 0 ? void 0 : authBtns.map(function (e) {
       return _extends({}, e, {
@@ -21,10 +42,30 @@ var ZConfigProvider = function ZConfigProvider(_ref) {
     }),
     singleWarehouseConfig: _extends({}, singleWarehouseConfig, singleWarehouseConfig !== null && singleWarehouseConfig !== void 0 && singleWarehouseConfig.requestConfig ? {
       requestConfig: processRequestConfig(singleWarehouseConfig === null || singleWarehouseConfig === void 0 ? void 0 : singleWarehouseConfig.requestConfig)
-    } : {}),
+    } : {}, {
+      defaultConfig: processEmptyObject((_singleWarehouseConfi = singleWarehouseConfig === null || singleWarehouseConfig === void 0 ? void 0 : singleWarehouseConfig.defaultConfig) !== null && _singleWarehouseConfi !== void 0 ? _singleWarehouseConfi : {})
+    }),
     singleFactoryConfig: _extends({}, singleFactoryConfig, singleFactoryConfig !== null && singleFactoryConfig !== void 0 && singleFactoryConfig.requestConfig ? {
       requestConfig: processRequestConfig(singleFactoryConfig === null || singleFactoryConfig === void 0 ? void 0 : singleFactoryConfig.requestConfig)
-    } : {})
+    } : {}, {
+      defaultConfig: processEmptyObject((_singleFactoryConfig$ = singleFactoryConfig === null || singleFactoryConfig === void 0 ? void 0 : singleFactoryConfig.defaultConfig) !== null && _singleFactoryConfig$ !== void 0 ? _singleFactoryConfig$ : {})
+    }),
+    asyncSelect: _extends({}, asyncSelect, {
+      fieldNames: processEmptyObject((_asyncSelect$fieldNam = asyncSelect === null || asyncSelect === void 0 ? void 0 : asyncSelect.fieldNames) !== null && _asyncSelect$fieldNam !== void 0 ? _asyncSelect$fieldNam : {}),
+      pager: processEmptyObject((_asyncSelect$pager = asyncSelect === null || asyncSelect === void 0 ? void 0 : asyncSelect.pager) !== null && _asyncSelect$pager !== void 0 ? _asyncSelect$pager : {})
+    }),
+    form: _extends({}, form, {
+      footer: processEmptyObject((_form$footer = form === null || form === void 0 ? void 0 : form.footer) !== null && _form$footer !== void 0 ? _form$footer : {})
+    }),
+    ossConfig: processEmptyObject(ossConfig !== null && ossConfig !== void 0 ? ossConfig : {}),
+    print: _extends({}, print, {
+      printer: processEmptyObject((_print$printer = print === null || print === void 0 ? void 0 : print.printer) !== null && _print$printer !== void 0 ? _print$printer : {})
+    }),
+    tableOptions: _extends({}, tableOptions, {
+      pagination: processEmptyObject((_tableOptions$paginat = tableOptions === null || tableOptions === void 0 ? void 0 : tableOptions.pagination) !== null && _tableOptions$paginat !== void 0 ? _tableOptions$paginat : {}),
+      sortNames: processEmptyObject((_tableOptions$sortNam = tableOptions === null || tableOptions === void 0 ? void 0 : tableOptions.sortNames) !== null && _tableOptions$sortNam !== void 0 ? _tableOptions$sortNam : {})
+    }),
+    tplOptions: processEmptyObject(tplOptions !== null && tplOptions !== void 0 ? tplOptions : {})
   }, restProps);
   console.log(props, 'configProvider');
   return /*#__PURE__*/React.createElement(RcConfigProvider, props, children);

package/es/utils/props/common.d.ts

@@ -1 +1,7 @@
 export declare const processRequestConfig: (props: any) => any;
+/**
+ * 根据对象是否为空判断返回值
+ * @param obj
+ * @returns undefined | obj
+ */
+export declare const processEmptyObject: (obj?: any) => any;

package/es/utils/props/common.js

@@ -1,6 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 var _excluded = ["singleWarehouse"];
+import _ from 'lodash';
 export var processRequestConfig = function processRequestConfig(props) {
   var _props$headers;
   var singleWarehouse = props.singleWarehouse,
@@ -10,4 +11,20 @@ export var processRequestConfig = function processRequestConfig(props) {
       singleWarehouse: true
     } : {})
   } : {});
+};
+
+/**
+ * 根据对象是否为空判断返回值
+ * @param obj
+ * @returns undefined | obj
+ */
+export var processEmptyObject = function processEmptyObject(obj) {
+  if (obj === void 0) {
+    obj = {};
+  }
+  // 判断对象是否为空
+  var empty = _ === null || _ === void 0 ? void 0 : _.isEmpty(_ === null || _ === void 0 ? void 0 : _.pickBy(obj, function (value) {
+    return value !== null && value !== undefined;
+  }));
+  return empty ? undefined : obj;
 };

package/es/utils/props/form.js

@@ -169,9 +169,9 @@ export var processFormProps = function processFormProps(props) {
         width: labelColWidth
       })
     })
-  }, settingOpt ? {
+  }, typeof settingOpt === 'string' && settingOpt !== null && settingOpt !== void 0 && settingOpt.trim() ? {
     settingOpt: {
-      key: "form_setting_" + Math.random()
+      key: "" + (settingOpt === null || settingOpt === void 0 ? void 0 : settingOpt.trim())
     }
   } : {}, {
     defaultColsNumber: defaultColsNumber,

package/lib/components/z-config-provider/configProvider.js

@@ -9,17 +9,38 @@ var React = _interopRequireWildcard(require("react"));
 var _rcPro = require("@ztocwst/rc-pro");
 var _common = require("../../utils/props/common");
 var _excluded = ["children"],
-  _excluded2 = ["authBtns", "singleWarehouseConfig", "singleFactoryConfig"];
+  _excluded2 = ["authBtns", "singleWarehouseConfig", "singleFactoryConfig", "asyncSelect", "form", "ossConfig", "print", "tableOptions", "tplOptions"];
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var ZConfigProvider = function ZConfigProvider(_ref) {
+  var _singleWarehouseConfi, _singleFactoryConfig$, _asyncSelect$fieldNam, _asyncSelect$pager, _form$footer, _print$printer, _tableOptions$paginat, _tableOptions$sortNam;
   var children = _ref.children,
     rest = (0, _objectWithoutPropertiesLoose2["default"])(_ref, _excluded);
   var _rest$authBtns = rest.authBtns,
     authBtns = _rest$authBtns === void 0 ? [] : _rest$authBtns,
     singleWarehouseConfig = rest.singleWarehouseConfig,
     singleFactoryConfig = rest.singleFactoryConfig,
+    asyncSelect = rest.asyncSelect,
+    form = rest.form,
+    ossConfig = rest.ossConfig,
+    print = rest.print,
+    tableOptions = rest.tableOptions,
+    tplOptions = rest.tplOptions,
     restProps = (0, _objectWithoutPropertiesLoose2["default"])(rest, _excluded2);
+
+  /**
+   *
+   * 过滤空对象，如果对象中的值都是undefined，整个对象赋值 undefined
+   * asyncSelect 中的 fieldNames、pager 对象
+   * form 中的 footer对象
+   * ossConfig 对象
+   * print 中的 printer
+   * tableOptions 中的 pagination、sortNames
+   * tplOptions 对象
+   * singleWarehouseConfig 中 defaultConfig
+   * singleFactoryConfig 中 defaultConfig
+   */
+
   var props = (0, _extends2["default"])({
     authBtns: authBtns === null || authBtns === void 0 ? void 0 : authBtns.map(function (e) {
       return (0, _extends2["default"])({}, e, {
@@ -28,10 +49,30 @@ var ZConfigProvider = function ZConfigProvider(_ref) {
     }),
     singleWarehouseConfig: (0, _extends2["default"])({}, singleWarehouseConfig, singleWarehouseConfig !== null && singleWarehouseConfig !== void 0 && singleWarehouseConfig.requestConfig ? {
       requestConfig: (0, _common.processRequestConfig)(singleWarehouseConfig === null || singleWarehouseConfig === void 0 ? void 0 : singleWarehouseConfig.requestConfig)
-    } : {}),
+    } : {}, {
+      defaultConfig: (0, _common.processEmptyObject)((_singleWarehouseConfi = singleWarehouseConfig === null || singleWarehouseConfig === void 0 ? void 0 : singleWarehouseConfig.defaultConfig) !== null && _singleWarehouseConfi !== void 0 ? _singleWarehouseConfi : {})
+    }),
     singleFactoryConfig: (0, _extends2["default"])({}, singleFactoryConfig, singleFactoryConfig !== null && singleFactoryConfig !== void 0 && singleFactoryConfig.requestConfig ? {
       requestConfig: (0, _common.processRequestConfig)(singleFactoryConfig === null || singleFactoryConfig === void 0 ? void 0 : singleFactoryConfig.requestConfig)
-    } : {})
+    } : {}, {
+      defaultConfig: (0, _common.processEmptyObject)((_singleFactoryConfig$ = singleFactoryConfig === null || singleFactoryConfig === void 0 ? void 0 : singleFactoryConfig.defaultConfig) !== null && _singleFactoryConfig$ !== void 0 ? _singleFactoryConfig$ : {})
+    }),
+    asyncSelect: (0, _extends2["default"])({}, asyncSelect, {
+      fieldNames: (0, _common.processEmptyObject)((_asyncSelect$fieldNam = asyncSelect === null || asyncSelect === void 0 ? void 0 : asyncSelect.fieldNames) !== null && _asyncSelect$fieldNam !== void 0 ? _asyncSelect$fieldNam : {}),
+      pager: (0, _common.processEmptyObject)((_asyncSelect$pager = asyncSelect === null || asyncSelect === void 0 ? void 0 : asyncSelect.pager) !== null && _asyncSelect$pager !== void 0 ? _asyncSelect$pager : {})
+    }),
+    form: (0, _extends2["default"])({}, form, {
+      footer: (0, _common.processEmptyObject)((_form$footer = form === null || form === void 0 ? void 0 : form.footer) !== null && _form$footer !== void 0 ? _form$footer : {})
+    }),
+    ossConfig: (0, _common.processEmptyObject)(ossConfig !== null && ossConfig !== void 0 ? ossConfig : {}),
+    print: (0, _extends2["default"])({}, print, {
+      printer: (0, _common.processEmptyObject)((_print$printer = print === null || print === void 0 ? void 0 : print.printer) !== null && _print$printer !== void 0 ? _print$printer : {})
+    }),
+    tableOptions: (0, _extends2["default"])({}, tableOptions, {
+      pagination: (0, _common.processEmptyObject)((_tableOptions$paginat = tableOptions === null || tableOptions === void 0 ? void 0 : tableOptions.pagination) !== null && _tableOptions$paginat !== void 0 ? _tableOptions$paginat : {}),
+      sortNames: (0, _common.processEmptyObject)((_tableOptions$sortNam = tableOptions === null || tableOptions === void 0 ? void 0 : tableOptions.sortNames) !== null && _tableOptions$sortNam !== void 0 ? _tableOptions$sortNam : {})
+    }),
+    tplOptions: (0, _common.processEmptyObject)(tplOptions !== null && tplOptions !== void 0 ? tplOptions : {})
   }, restProps);
   console.log(props, 'configProvider');
   return /*#__PURE__*/React.createElement(_rcPro.RcConfigProvider, props, children);

package/lib/utils/props/common.d.ts

@@ -1 +1,7 @@
 export declare const processRequestConfig: (props: any) => any;
+/**
+ * 根据对象是否为空判断返回值
+ * @param obj
+ * @returns undefined | obj
+ */
+export declare const processEmptyObject: (obj?: any) => any;

package/lib/utils/props/common.js

@@ -2,9 +2,10 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
-exports.processRequestConfig = void 0;
+exports.processRequestConfig = exports.processEmptyObject = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+var _lodash = _interopRequireDefault(require("lodash"));
 var _excluded = ["singleWarehouse"];
 var processRequestConfig = function processRequestConfig(props) {
   var _props$headers;
@@ -16,4 +17,21 @@ var processRequestConfig = function processRequestConfig(props) {
     } : {})
   } : {});
 };
-exports.processRequestConfig = processRequestConfig;
+
+/**
+ * 根据对象是否为空判断返回值
+ * @param obj
+ * @returns undefined | obj
+ */
+exports.processRequestConfig = processRequestConfig;
+var processEmptyObject = function processEmptyObject(obj) {
+  if (obj === void 0) {
+    obj = {};
+  }
+  // 判断对象是否为空
+  var empty = _lodash["default"] === null || _lodash["default"] === void 0 ? void 0 : _lodash["default"].isEmpty(_lodash["default"] === null || _lodash["default"] === void 0 ? void 0 : _lodash["default"].pickBy(obj, function (value) {
+    return value !== null && value !== undefined;
+  }));
+  return empty ? undefined : obj;
+};
+exports.processEmptyObject = processEmptyObject;

package/lib/utils/props/form.js

@@ -173,9 +173,9 @@ var processFormProps = function processFormProps(props) {
         width: labelColWidth
       })
     })
-  }, settingOpt ? {
+  }, typeof settingOpt === 'string' && settingOpt !== null && settingOpt !== void 0 && settingOpt.trim() ? {
     settingOpt: {
-      key: "form_setting_" + Math.random()
+      key: "" + (settingOpt === null || settingOpt === void 0 ? void 0 : settingOpt.trim())
     }
   } : {}, {
     defaultColsNumber: defaultColsNumber,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ztocwst/rc-pro-materials",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "@ztocwst/rc-pro-materials",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -86,9 +86,9 @@
   },
   "componentConfig": {
     "isComponentLibrary": true,
-    "materialSchema": "https://npm.onmicrosoft.cn/@ztocwst/rc-pro-materials@0.2.3/build/lowcode/assets-prod.json"
+    "materialSchema": "https://npm.onmicrosoft.cn/@ztocwst/rc-pro-materials@0.2.5/build/lowcode/assets-prod.json"
   },
-  "homepage": "https://unpkg.com/@ztocwst/rc-pro-materials@0.2.3/build/index.html",
+  "homepage": "https://unpkg.com/@ztocwst/rc-pro-materials@0.2.5/build/index.html",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"