ronds-metadata 1.2.93 → 1.2.95

package/es/comps/MetadataForm/DataCell/Select.js

@@ -37,7 +37,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-07-04 16:30:59
+ * @LastEditTime: 2023-08-14 09:44:23
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -49,7 +49,7 @@ import { tr } from '../../../framework/locale';
 import useObservable from '../../../framework/rxjs-hooks/useObservable';
 import { assignReplace, findTopParentIndex } from '../utils';
 function Index(props) {
-  var _extraInfo$http9, _extraInfo$http10, _extraInfo$http11, _extraInfo$http12, _extraInfo$http13, _extraInfo$http14;
+  var _extraInfo$http11, _extraInfo$http12, _extraInfo$http13, _extraInfo$http14, _extraInfo$http15, _extraInfo$http16;
   var id = props.id,
     name = props.name,
     isRefForm = props.isRefForm,
@@ -274,12 +274,12 @@ function Index(props) {
     return processSelectOptionsData();
   }, [initEnumValue, myEnum, id, extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.maxSelect]);
   var httpOptions = useAsyncMemo( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-    var _extraInfo$http3, _extraInfo$http4, _extraInfo$http5, res;
+    var _extraInfo$http3, _extraInfo$http4, _extraInfo$http5, res, _extraInfo$http6, _extraInfo$http7, _enum;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           if (!((extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.http) && (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.http.url))) {
-            _context2.next = 7;
+            _context2.next = 9;
             break;
           }
           _context2.next = 3;
@@ -293,9 +293,22 @@ function Index(props) {
             setTreeData(_toConsumableArray(res));
           }
           return _context2.abrupt("return", res);
-        case 7:
+        case 9:
+          if (!initEnumValue[id]) {
+            _context2.next = 14;
+            break;
+          }
+          _enum = deepClone(initEnumValue[id]);
+          if (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$http6 = extraInfo.http) === null || _extraInfo$http6 === void 0 ? void 0 : _extraInfo$http6.isCascader) {
+            setCascaderOption(_toConsumableArray(_enum));
+          }
+          if (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$http7 = extraInfo.http) === null || _extraInfo$http7 === void 0 ? void 0 : _extraInfo$http7.isTreeSelect) {
+            setTreeData(_toConsumableArray(_enum));
+          }
+          return _context2.abrupt("return", _enum);
+        case 14:
           return _context2.abrupt("return", []);
-        case 8:
+        case 15:
         case "end":
           return _context2.stop();
       }
@@ -524,7 +537,7 @@ function Index(props) {
     }
   };
   if (isObj && isRefForm && field) {
-    var _extraInfo$http6, _extraInfo$http7, _extraInfo$http8;
+    var _extraInfo$http8, _extraInfo$http9, _extraInfo$http10;
     return /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
       style: {
         flex: 1,
@@ -552,7 +565,7 @@ function Index(props) {
       }],
       help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
       tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
-    }), processSelectType((_extraInfo$http6 = extraInfo.http) === null || _extraInfo$http6 === void 0 ? void 0 : _extraInfo$http6.isCascader, (_extraInfo$http7 = extraInfo.http) === null || _extraInfo$http7 === void 0 ? void 0 : _extraInfo$http7.isTreeSelect, (_extraInfo$http8 = extraInfo.http) === null || _extraInfo$http8 === void 0 ? void 0 : _extraInfo$http8.isPagination));
+    }), processSelectType((_extraInfo$http8 = extraInfo.http) === null || _extraInfo$http8 === void 0 ? void 0 : _extraInfo$http8.isCascader, (_extraInfo$http9 = extraInfo.http) === null || _extraInfo$http9 === void 0 ? void 0 : _extraInfo$http9.isTreeSelect, (_extraInfo$http10 = extraInfo.http) === null || _extraInfo$http10 === void 0 ? void 0 : _extraInfo$http10.isPagination));
   }
   return !field ? /*#__PURE__*/React.createElement(_Form.Item, {
     key: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.defaultValue,
@@ -582,7 +595,7 @@ function Index(props) {
     }],
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
-  }, processSelectType((_extraInfo$http9 = extraInfo.http) === null || _extraInfo$http9 === void 0 ? void 0 : _extraInfo$http9.isCascader, (_extraInfo$http10 = extraInfo.http) === null || _extraInfo$http10 === void 0 ? void 0 : _extraInfo$http10.isTreeSelect, (_extraInfo$http11 = extraInfo.http) === null || _extraInfo$http11 === void 0 ? void 0 : _extraInfo$http11.isPagination)) : /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
+  }, processSelectType((_extraInfo$http11 = extraInfo.http) === null || _extraInfo$http11 === void 0 ? void 0 : _extraInfo$http11.isCascader, (_extraInfo$http12 = extraInfo.http) === null || _extraInfo$http12 === void 0 ? void 0 : _extraInfo$http12.isTreeSelect, (_extraInfo$http13 = extraInfo.http) === null || _extraInfo$http13 === void 0 ? void 0 : _extraInfo$http13.isPagination)) : /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
     style: {
       flex: 1,
       paddingRight: '10px'
@@ -593,6 +606,6 @@ function Index(props) {
     }],
     help: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.help,
     tooltip: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip
-  }), processSelectType((_extraInfo$http12 = extraInfo.http) === null || _extraInfo$http12 === void 0 ? void 0 : _extraInfo$http12.isCascader, (_extraInfo$http13 = extraInfo.http) === null || _extraInfo$http13 === void 0 ? void 0 : _extraInfo$http13.isTreeSelect, (_extraInfo$http14 = extraInfo.http) === null || _extraInfo$http14 === void 0 ? void 0 : _extraInfo$http14.isPagination));
+  }), processSelectType((_extraInfo$http14 = extraInfo.http) === null || _extraInfo$http14 === void 0 ? void 0 : _extraInfo$http14.isCascader, (_extraInfo$http15 = extraInfo.http) === null || _extraInfo$http15 === void 0 ? void 0 : _extraInfo$http15.isTreeSelect, (_extraInfo$http16 = extraInfo.http) === null || _extraInfo$http16 === void 0 ? void 0 : _extraInfo$http16.isPagination));
 }
 export default /*#__PURE__*/React.memo(Index);

package/es/framework/hooks/useModel/index.d.ts

@@ -0,0 +1,9 @@
+import Provider from './utils/Provider';
+import Context from './utils/Context';
+type ReturnTypes<T extends any> = T extends (...args: any) => infer R ? R : any;
+type Model<T extends keyof U, U> = {
+    [key in keyof U]: ReturnTypes<U[T]>;
+};
+type UseModelFn = <T extends keyof U, U>(namespace: T) => Model<T, U>[T];
+declare const useModel: UseModelFn;
+export { useModel, Provider, Context, Model };

package/es/framework/hooks/useModel/index.js

@@ -0,0 +1,50 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+/*
+ * @Author: wangxian
+ * @Date: 2023-08-01 19:30:25
+ * @LastEditTime: 2023-08-01 19:30:35
+ */
+import { useEffect, useContext, useRef, useState } from 'react';
+import Provider from './utils/Provider';
+import Context from './utils/Context';
+var useModel = function useModel(namespace) {
+  var dispatcher = useContext(Context);
+  // 判断组件是否挂载
+  var isMount = useRef(false);
+  var _useState = useState(dispatcher.data[namespace]),
+    _useState2 = _slicedToArray(_useState, 2),
+    state = _useState2[0],
+    setState = _useState2[1];
+  useEffect(function () {
+    isMount.current = true;
+    return function () {
+      isMount.current = false;
+    };
+  }, []);
+  useEffect(function () {
+    var handler = function handler(value) {
+      if (!isMount.current) {
+        // 如果函数执行中，组件被卸载，则强制更新全局 data
+        setTimeout(function () {
+          dispatcher.data[namespace] = value;
+          dispatcher.update(namespace);
+        });
+      } else {
+        setState(value);
+      }
+    };
+    try {
+      dispatcher.callBacks[namespace].add(handler);
+      dispatcher.update(namespace);
+    } catch (e) {
+      dispatcher.callBacks[namespace] = new Set();
+      dispatcher.callBacks[namespace].add(handler);
+      dispatcher.update(namespace);
+    }
+    return function () {
+      dispatcher.callBacks[namespace].delete(handler);
+    };
+  }, [namespace]);
+  return state;
+};
+export { useModel, Provider, Context };

package/es/framework/hooks/useModel/utils/Context.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const _default: import("react").Context<{}>;
+export default _default;

package/es/framework/hooks/useModel/utils/Context.js

@@ -0,0 +1,2 @@
+import { createContext } from 'react';
+export default /*#__PURE__*/createContext({});

package/es/framework/hooks/useModel/utils/Executor.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+type ExecutorProps = {
+    hook: () => void;
+    namespace: string;
+    onUpdate: (value: any) => void;
+};
+declare const Executor: React.FC<ExecutorProps>;
+export default Executor;

package/es/framework/hooks/useModel/utils/Executor.js

@@ -0,0 +1,33 @@
+import React, { useEffect, useMemo, useRef } from 'react';
+var Executor = function Executor(_ref) {
+  var hook = _ref.hook,
+    namespace = _ref.namespace,
+    onUpdate = _ref.onUpdate;
+  var updateRef = useRef(onUpdate);
+  updateRef.current = onUpdate;
+  var initRef = useRef(false);
+  var data;
+  try {
+    if (typeof hook === 'function') {
+      data = hook();
+    } else {
+      data = null;
+    }
+  } catch (e) {
+    throw new TypeError(e);
+  }
+  // 初始化时执行一次
+  useMemo(function () {
+    updateRef.current(data);
+    initRef.current = false;
+  }, []);
+  useEffect(function () {
+    if (initRef.current) {
+      updateRef.current(data);
+    } else {
+      initRef.current = true;
+    }
+  });
+  return /*#__PURE__*/React.createElement(React.Fragment, null);
+};
+export default Executor;

package/es/framework/hooks/useModel/utils/Provider.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+declare const Provider: React.FC<{
+    models: any;
+}>;
+export default Provider;

package/es/framework/hooks/useModel/utils/Provider.js

@@ -0,0 +1,30 @@
+/*
+ * @Author: wangxian
+ * @Date: 2023-08-01 19:31:08
+ * @LastEditTime: 2023-08-01 19:32:27
+ */
+import React from 'react';
+import Dispatcher from './dispatcher';
+import Executor from './Executor';
+import Context from './Context';
+var dispatcher = new Dispatcher();
+var Provider = function Provider(_ref) {
+  var children = _ref.children,
+    _ref$models = _ref.models,
+    models = _ref$models === void 0 ? {} : _ref$models;
+  var Exe = Executor;
+  return /*#__PURE__*/React.createElement(Context.Provider, {
+    value: dispatcher
+  }, Object.keys(models).map(function (item) {
+    return /*#__PURE__*/React.createElement(Exe, {
+      key: item,
+      namespace: item,
+      hook: models[item],
+      onUpdate: function onUpdate(value) {
+        dispatcher.data[item] = value;
+        dispatcher.update(item);
+      }
+    });
+  }), children);
+};
+export default Provider;

package/es/framework/hooks/useModel/utils/dispatcher.d.ts

@@ -0,0 +1,5 @@
+export default class Dispatcher {
+    data: any;
+    callBacks: any;
+    update: (namespace: string) => void;
+}

package/es/framework/hooks/useModel/utils/dispatcher.js

@@ -0,0 +1,24 @@
+import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+/*
+ * @Author: wangxian
+ * @Date: 2023-08-01 19:31:09
+ * @LastEditTime: 2023-08-01 19:32:07
+ */
+var Dispatcher = /*#__PURE__*/_createClass(function Dispatcher() {
+  var _this = this;
+  _classCallCheck(this, Dispatcher);
+  this.data = {};
+  this.callBacks = {};
+  this.update = function (namespace) {
+    (_this.callBacks[namespace] || []).forEach(function (callback) {
+      try {
+        var data = _this.data[namespace];
+        callback(data);
+      } catch (e) {
+        callback(undefined);
+      }
+    });
+  };
+});
+export { Dispatcher as default };

package/es/index.d.ts

@@ -19,6 +19,7 @@ export * from './framework/metadata/index';
 export { default as http, addInterceptor } from './framework/http/index';
 export { default as useMemoSubject } from './framework/rxjs-hooks/useMemoSubject';
 export { default as useObservable } from './framework/rxjs-hooks/useObservable';
+export { useModel, Provider, Context } from './framework/hooks/useModel';
 export { default as useSyncScroll, useSyncScrollByRefs } from './framework/hooks/use-sync-scroll';
 export { registerMetadataAPI } from './framework/metadata/MetadataService';
 export { FormRobot } from './framework/fg/index';

package/es/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-04-27 19:08:54
+ * @LastEditTime: 2023-08-02 08:41:39
  */
 import './theme.less';
 export { default as MetadataEdit } from './comps/MetadataEdit';
@@ -24,6 +24,7 @@ export * from './framework/metadata/index';
 export { default as http, addInterceptor } from './framework/http/index';
 export { default as useMemoSubject } from './framework/rxjs-hooks/useMemoSubject';
 export { default as useObservable } from './framework/rxjs-hooks/useObservable';
+export { useModel, Provider, Context } from './framework/hooks/useModel';
 export { default as useSyncScroll, useSyncScrollByRefs } from './framework/hooks/use-sync-scroll';
 export { registerMetadataAPI } from './framework/metadata/MetadataService';
 export { FormRobot } from './framework/fg/index';

package/package.json

@@ -1,7 +1,7 @@
 {
   "public": true,
   "name": "ronds-metadata",
-  "version": "1.2.93",
+  "version": "1.2.95",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",