@ztocwst/rc-pro-materials 0.2.4 → 0.2.5

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

@@ -6,7 +6,7 @@ import * as React from 'react';
 import { RcConfigProvider } from '@ztocwst/rc-pro';
 import { processEmptyObject, processRequestConfig } from "../../utils/props/common";
 var ZConfigProvider = function ZConfigProvider(_ref) {
-  var _asyncSelect$fieldNam, _asyncSelect$pager, _form$footer, _print$printer, _tableOptions$paginat, _tableOptions$sortNam;
+  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,
@@ -30,7 +30,8 @@ var ZConfigProvider = function ZConfigProvider(_ref) {
    * print 中的 printer
    * tableOptions 中的 pagination、sortNames
    * tplOptions 对象
-   *
+   * singleWarehouseConfig 中 defaultConfig
+   * singleFactoryConfig 中 defaultConfig
    */
 
   var props = _extends({
@@ -41,10 +42,14 @@ 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 : {})

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

@@ -13,7 +13,7 @@ var _excluded = ["children"],
 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 _asyncSelect$fieldNam, _asyncSelect$pager, _form$footer, _print$printer, _tableOptions$paginat, _tableOptions$sortNam;
+  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,
@@ -37,7 +37,8 @@ var ZConfigProvider = function ZConfigProvider(_ref) {
    * print 中的 printer
    * tableOptions 中的 pagination、sortNames
    * tplOptions 对象
-   *
+   * singleWarehouseConfig 中 defaultConfig
+   * singleFactoryConfig 中 defaultConfig
    */
 
   var props = (0, _extends2["default"])({
@@ -48,10 +49,14 @@ 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 : {})

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.4",
+  "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.4/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.4/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"