@zgfe/business-lib 1.1.46 → 1.1.48

package/config.js

@@ -8,12 +8,32 @@ const path = require('path');
  */
 function getConfig(defaultConfig, basePath) {
   const configPath = path.resolve(basePath, '.config.json');
-  if (fs.existsSync(configPath)) {
-    const config = fs.readFileSync(configPath, 'utf-8');
-    return JSON.parse(config);
+  let resConfig = defaultConfig;
+  try {
+    if (fs.existsSync(configPath)) {
+      const config = fs.readFileSync(configPath, 'utf-8');
+      if (!config || config === '{}') {
+        throw new Error('配置文件为空');
+      }
+      const configObj = JSON.parse(config);
+      // 如果读取的配置文件，数据结构与默认配置不一致，则更新配置文件，更新规则：以默认配置为准，保留用户自定义配置
+      const isSame = Object.keys(defaultConfig).every((key) => {
+        return configObj.hasOwnProperty(key);
+      });
+      if (!isSame) {
+        resConfig = Object.assign({}, defaultConfig, configObj);
+        throw new Error('配置文件数据结构不一致');
+      }
+      resConfig = configObj;
+    } else {
+      throw new Error('配置文件不存在');
+    }
+  } catch (e) {
+    console.log(e.message);
+    fs.writeFileSync(configPath, JSON.stringify(resConfig, null, 2));
   }
-  fs.writeFileSync(configPath, JSON.stringify(defaultConfig, null, 2));
-  return defaultConfig;
+  console.log('配置详情', resConfig);
+  return resConfig;
 }
 
 module.exports = {

package/es/demoWrapper/content.d.ts

@@ -1,8 +1,9 @@
 import React, { ReactNode } from 'react';
-import { AppInfoProps } from '../context';
+import { AppInfoProps, GlobalContextProps } from '../context';
 declare const DemoContent: React.FC<{
     children?: ReactNode;
     needMeta?: boolean;
     currentApp?: AppInfoProps;
+    contextProps?: GlobalContextProps;
 }>;
 export default DemoContent;

package/es/demoWrapper/content.js

@@ -49,7 +49,8 @@ function ajax(url, options) {
 var DemoContent = function DemoContent(_ref3) {
   var children = _ref3.children,
     currentApp = _ref3.currentApp,
-    needMeta = _ref3.needMeta;
+    needMeta = _ref3.needMeta,
+    contextProps = _ref3.contextProps;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     eventGroups = _useState2[0],
@@ -168,7 +169,7 @@ var DemoContent = function DemoContent(_ref3) {
     });
   }
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(BizGlobalDataContext.Provider, {
-    value: {
+    value: _objectSpread({
       currentApp: _objectSpread(_objectSpread({}, currentApp), {}, {
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.id
       }),
@@ -178,7 +179,7 @@ var DemoContent = function DemoContent(_ref3) {
       eventIdMap: store === null || store === void 0 ? void 0 : store.eventIdMap,
       eventNameMap: store === null || store === void 0 ? void 0 : store.eventNameMap,
       userGroupList: userGroups
-    }
+    }, contextProps)
   }, children));
 };
 export default DemoContent;

package/es/demoWrapper/index.js

@@ -15,7 +15,8 @@ var DemoWrapper = function DemoWrapper(_ref) {
   var children = _ref.children,
     className = _ref.className,
     defaultApp = _ref.defaultApp,
-    needMeta = _ref.needMeta;
+    needMeta = _ref.needMeta,
+    contextProps = _ref.contextProps;
   var _useState = useState(true),
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
@@ -69,7 +70,8 @@ var DemoWrapper = function DemoWrapper(_ref) {
   }) : /*#__PURE__*/React.createElement(DemoContent, {
     currentApp: app,
     needMeta: needMeta,
-    key: app === null || app === void 0 ? void 0 : app.appId
+    key: app === null || app === void 0 ? void 0 : app.appId,
+    contextProps: contextProps
   }, children));
 };
 export default DemoWrapper;

package/es/demoWrapper/types.d.ts

@@ -1,10 +1,12 @@
 import React, { ReactNode } from 'react';
+import { GlobalContextProps } from '../context';
 declare namespace DemoWrapperTypes {
     interface Props {
         className?: string;
         defaultApp?: number;
         needMeta?: boolean;
         children?: ReactNode;
+        contextProps?: GlobalContextProps;
     }
 }
 export declare const Props: React.FC<DemoWrapperTypes.Props>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.46",
+  "version": "1.1.48",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -60,5 +60,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "e2f88bda1687860eabfc88b95bc95cd853b7134c"
+  "gitHead": "7e4a250cd2198b2f1bf9228858c4ffc818efdb54"
 }