wargerm 0.7.17 → 0.7.19

package/dist/hooks/wmox.d.ts

@@ -1,8 +1,15 @@
-declare type Callback = () => void;
-declare type State = Record<string, unknown>;
-declare let run: (fn: Callback) => void;
+declare type VoidFn = () => void;
+declare type OneAction<V> = V | ((val: V) => V);
+declare type ObjUpdater<Obj> = (obj: Obj) => Partial<Obj>;
+declare type Setter<Obj> = {
+    <K extends keyof Obj>(key: K, oneAction: OneAction<Obj[K]>): void;
+    (obj: Partial<Obj>): void;
+    (objUpdater: ObjUpdater<Obj>): void;
+};
+declare type Store<Obj> = Obj & Setter<Obj>;
+declare let run: (fn: VoidFn) => void;
 declare const wmox: {
-    <T extends State>(state: T): T;
+    <Obj extends Record<string, unknown>>(obj: Obj): Store<Obj>;
     config({ batch }: {
         batch: typeof run;
     }): void;

package/dist/index.css

@@ -39025,7 +39025,7 @@ button[data-prefers-color='dark'] .swiper-pagination-bullet {
   background: #fff;
   text-shadow: 0 -1px 0 rgb(0 0 0%);
   border-radius: 8px;
-  box-shadow: 0px 4px 7px 4px rgba(118, 140, 173, 0.33), 0px 2px 9px 1px rgba(179, 34, 34, 0.26) inset;
+  box-shadow: 0px 4px 7px 4px rgba(118, 140, 173, 0.33), 0px 2px 9px 1px rgba(116, 67, 67, 0.26) inset;
 }
 [data-prefers-color='light'] .ant-btn-primary {
   color: #fff;
@@ -39036,10 +39036,7 @@ button[data-prefers-color='dark'] .swiper-pagination-bullet {
 [data-prefers-color='light'] .ant-btn-default {
   background: rgba(118, 140, 173, 0.2);
   border-radius: 8px;
-  box-shadow: 0px 4px 7px 4px rgba(118, 140, 173, 0.33);
-  font-size: 16px;
-  font-family: Microsoft YaHei Regular, Microsoft YaHei Regular-Regular;
-  font-weight: 400;
+  box-shadow: 0px 1px 4px 0px rgba(118, 140, 173, 0.17);
   color: #708191;
 }
 [data-prefers-color='light'] .ant-input {

package/dist/index.esm.css

@@ -39025,7 +39025,7 @@ button[data-prefers-color='dark'] .swiper-pagination-bullet {
   background: #fff;
   text-shadow: 0 -1px 0 rgb(0 0 0%);
   border-radius: 8px;
-  box-shadow: 0px 4px 7px 4px rgba(118, 140, 173, 0.33), 0px 2px 9px 1px rgba(179, 34, 34, 0.26) inset;
+  box-shadow: 0px 4px 7px 4px rgba(118, 140, 173, 0.33), 0px 2px 9px 1px rgba(116, 67, 67, 0.26) inset;
 }
 [data-prefers-color='light'] .ant-btn-primary {
   color: #fff;
@@ -39036,10 +39036,7 @@ button[data-prefers-color='dark'] .swiper-pagination-bullet {
 [data-prefers-color='light'] .ant-btn-default {
   background: rgba(118, 140, 173, 0.2);
   border-radius: 8px;
-  box-shadow: 0px 4px 7px 4px rgba(118, 140, 173, 0.33);
-  font-size: 16px;
-  font-family: Microsoft YaHei Regular, Microsoft YaHei Regular-Regular;
-  font-weight: 400;
+  box-shadow: 0px 1px 4px 0px rgba(118, 140, 173, 0.17);
   color: #708191;
 }
 [data-prefers-color='light'] .ant-input {

package/dist/index.esm.js

@@ -634,25 +634,41 @@ create.config = function (_ref) {
   run = batch;
 };
 
+var __DEV__$1 = process.env.NODE_ENV !== 'production';
+
+var isObj = function isObj(val) {
+  return Object.prototype.toString.call(val) === '[object Object]';
+};
+
+var isGetStateInMethod = false;
+
 var run$1 = function run(fn) {
   fn();
 };
 
-var __DEV__$1 = process.env.NODE_ENV !== 'production';
-
-var wmox = function wmox(state) {
-  if (__DEV__$1 && Object.prototype.toString.call(state) !== '[object Object]') {
+var wmox = function wmox(obj) {
+  if (__DEV__$1 && !isObj(obj)) {
     throw new Error('object required');
   }
 
-  var store = {};
-  Object.keys(state).forEach(function (key) {
-    if (typeof state[key] === 'function') {
+  var state = {};
+  var methods = {};
+  Object.keys(obj).forEach(function (key) {
+    var initVal = obj[key];
+
+    if (initVal instanceof Function) {
+      methods[key] = function () {
+        isGetStateInMethod = true;
+        var res = initVal.apply(void 0, arguments);
+        isGetStateInMethod = false;
+        return res;
+      };
+
       return;
     }
 
     var listeners = new Set();
-    store[key] = {
+    state[key] = {
       subscribe: function subscribe(listener) {
         listeners.add(listener);
         return function () {
@@ -660,11 +676,11 @@ var wmox = function wmox(state) {
         };
       },
       getSnapshot: function getSnapshot() {
-        return state[key];
+        return obj[key];
       },
       setSnapshot: function setSnapshot(val) {
-        if (val !== state[key]) {
-          state[key] = val;
+        if (val !== obj[key]) {
+          obj[key] = val;
           run$1(function () {
             return listeners.forEach(function (listener) {
               return listener();
@@ -673,27 +689,85 @@ var wmox = function wmox(state) {
         }
       },
       useSnapshot: function useSnapshot() {
-        return useSyncExternalStore(store[key].subscribe, store[key].getSnapshot);
+        return useSyncExternalStore(state[key].subscribe, state[key].getSnapshot, state[key].getSnapshot);
       }
     };
   });
-  return new Proxy(state, {
-    get: function get(_, key) {
-      try {
-        return store[key].useSnapshot();
-      } catch (e) {
-        return state[key];
+
+  var setState = function setState(key, val) {
+    if (key in obj) {
+      if (key in state) {
+        var newVal = val instanceof Function ? val(obj[key]) : val;
+        state[key].setSnapshot(newVal);
+      } else if (__DEV__$1) {
+        throw new Error("`".concat(key, "` is a method, can not update"));
+      }
+    } else if (__DEV__$1) {
+      throw new Error("`".concat(key, "` is not initialized in store"));
+    }
+  };
+
+  return new Proxy(function () {
+    return undefined;
+  }, {
+    get: function get(_target, key) {
+      if (key in methods) {
+        return methods[key];
+      }
+
+      if (key in state) {
+        if (isGetStateInMethod) {
+          return obj[key];
+        }
+
+        try {
+          return state[key].useSnapshot();
+        } catch (err) {
+          return obj[key];
+        }
+      }
+
+      if (__DEV__$1) {
+        if (key !== 'prototype' && key !== 'name' && key !== 'displayName') {
+          throw new Error("`".concat(key, "` is not initialized in store"));
+        }
       }
     },
-    set: function set(_, key, val) {
-      store[key].setSnapshot(val);
+    set: function set(_target, key, val) {
+      setState(key, val);
       return true;
+    },
+    apply: function apply(_target, _thisArg, _ref) {
+      var _ref2 = _slicedToArray(_ref, 2),
+          firstArg = _ref2[0],
+          oneAction = _ref2[1];
+
+      if (typeof firstArg === 'string') {
+        setState(firstArg, oneAction);
+        return;
+      }
+
+      if (isObj(firstArg)) {
+        var newObj = firstArg;
+        Object.keys(newObj).forEach(function (key) {
+          setState(key, newObj[key]);
+        });
+        return;
+      }
+
+      if (typeof firstArg === 'function') {
+        var _newObj = firstArg(obj);
+
+        Object.keys(_newObj).forEach(function (key) {
+          setState(key, _newObj[key]);
+        });
+      }
     }
   });
 };
 
-wmox.config = function (_ref) {
-  var batch = _ref.batch;
+wmox.config = function (_ref3) {
+  var batch = _ref3.batch;
   run$1 = batch;
 };
 
@@ -2380,14 +2454,15 @@ function Index$1(_ref, ref) {
 
               if (file.status === 'done' || file.status === 'removed') {
                 file.url = file.response;
-                urls = newFileList.map(function (file) {
+                urls = _toConsumableArray(newFileList).map(function (file) {
                   return file.url;
                 }).join(splitStr);
                 onChange && onChange(urls);
-              } // setFileList(newFileList)
+              }
 
+              setFileList(_toConsumableArray(newFileList));
 
-            case 2:
+            case 3:
             case "end":
               return _context.stop();
           }
@@ -2402,7 +2477,7 @@ function Index$1(_ref, ref) {
 
   var request = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(options) {
-      var onSuccess, onError, file, onProgress, url, fileObj, newFileList;
+      var onSuccess, onError, file, onProgress, url, fileObj;
       return regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
@@ -2424,9 +2499,9 @@ function Index$1(_ref, ref) {
                   thumbUrl: url,
                   originFileObj: file,
                   xhr: onProgress
-                };
-                newFileList = [].concat(_toConsumableArray(fileList), [fileObj]);
-                setFileList(newFileList);
+                }; // const newFileList = [...fileList, fileObj]
+                // setFileList(newFileList);
+
                 onSuccess(url, file);
               }
 
@@ -7676,7 +7751,9 @@ var TabelCard = function TabelCard(props, ref) {
       valueType: 'option',
       align: 'center',
       render: function render(_, record, index) {
-        return tableActionDom(record, index);
+        return /*#__PURE__*/React.createElement("div", {
+          className: "flex w100p jc-c ai-c"
+        }, tableActionDom(record, index));
       }
     }, optionColumnConfig)]).map(function (item) {
       var obj = _objectSpread2({}, item);

package/dist/index.js

@@ -678,25 +678,41 @@ create.config = function (_ref) {
   run = batch;
 };
 
+var __DEV__$1 = process.env.NODE_ENV !== 'production';
+
+var isObj = function isObj(val) {
+  return Object.prototype.toString.call(val) === '[object Object]';
+};
+
+var isGetStateInMethod = false;
+
 var run$1 = function run(fn) {
   fn();
 };
 
-var __DEV__$1 = process.env.NODE_ENV !== 'production';
-
-var wmox = function wmox(state) {
-  if (__DEV__$1 && Object.prototype.toString.call(state) !== '[object Object]') {
+var wmox = function wmox(obj) {
+  if (__DEV__$1 && !isObj(obj)) {
     throw new Error('object required');
   }
 
-  var store = {};
-  Object.keys(state).forEach(function (key) {
-    if (typeof state[key] === 'function') {
+  var state = {};
+  var methods = {};
+  Object.keys(obj).forEach(function (key) {
+    var initVal = obj[key];
+
+    if (initVal instanceof Function) {
+      methods[key] = function () {
+        isGetStateInMethod = true;
+        var res = initVal.apply(void 0, arguments);
+        isGetStateInMethod = false;
+        return res;
+      };
+
       return;
     }
 
     var listeners = new Set();
-    store[key] = {
+    state[key] = {
       subscribe: function subscribe(listener) {
         listeners.add(listener);
         return function () {
@@ -704,11 +720,11 @@ var wmox = function wmox(state) {
         };
       },
       getSnapshot: function getSnapshot() {
-        return state[key];
+        return obj[key];
       },
       setSnapshot: function setSnapshot(val) {
-        if (val !== state[key]) {
-          state[key] = val;
+        if (val !== obj[key]) {
+          obj[key] = val;
           run$1(function () {
             return listeners.forEach(function (listener) {
               return listener();
@@ -717,27 +733,85 @@ var wmox = function wmox(state) {
         }
       },
       useSnapshot: function useSnapshot() {
-        return shim.useSyncExternalStore(store[key].subscribe, store[key].getSnapshot);
+        return shim.useSyncExternalStore(state[key].subscribe, state[key].getSnapshot, state[key].getSnapshot);
       }
     };
   });
-  return new Proxy(state, {
-    get: function get(_, key) {
-      try {
-        return store[key].useSnapshot();
-      } catch (e) {
-        return state[key];
+
+  var setState = function setState(key, val) {
+    if (key in obj) {
+      if (key in state) {
+        var newVal = val instanceof Function ? val(obj[key]) : val;
+        state[key].setSnapshot(newVal);
+      } else if (__DEV__$1) {
+        throw new Error("`".concat(key, "` is a method, can not update"));
+      }
+    } else if (__DEV__$1) {
+      throw new Error("`".concat(key, "` is not initialized in store"));
+    }
+  };
+
+  return new Proxy(function () {
+    return undefined;
+  }, {
+    get: function get(_target, key) {
+      if (key in methods) {
+        return methods[key];
+      }
+
+      if (key in state) {
+        if (isGetStateInMethod) {
+          return obj[key];
+        }
+
+        try {
+          return state[key].useSnapshot();
+        } catch (err) {
+          return obj[key];
+        }
+      }
+
+      if (__DEV__$1) {
+        if (key !== 'prototype' && key !== 'name' && key !== 'displayName') {
+          throw new Error("`".concat(key, "` is not initialized in store"));
+        }
       }
     },
-    set: function set(_, key, val) {
-      store[key].setSnapshot(val);
+    set: function set(_target, key, val) {
+      setState(key, val);
       return true;
+    },
+    apply: function apply(_target, _thisArg, _ref) {
+      var _ref2 = _slicedToArray(_ref, 2),
+          firstArg = _ref2[0],
+          oneAction = _ref2[1];
+
+      if (typeof firstArg === 'string') {
+        setState(firstArg, oneAction);
+        return;
+      }
+
+      if (isObj(firstArg)) {
+        var newObj = firstArg;
+        Object.keys(newObj).forEach(function (key) {
+          setState(key, newObj[key]);
+        });
+        return;
+      }
+
+      if (typeof firstArg === 'function') {
+        var _newObj = firstArg(obj);
+
+        Object.keys(_newObj).forEach(function (key) {
+          setState(key, _newObj[key]);
+        });
+      }
     }
   });
 };
 
-wmox.config = function (_ref) {
-  var batch = _ref.batch;
+wmox.config = function (_ref3) {
+  var batch = _ref3.batch;
   run$1 = batch;
 };
 
@@ -2424,14 +2498,15 @@ function Index$1(_ref, ref) {
 
               if (file.status === 'done' || file.status === 'removed') {
                 file.url = file.response;
-                urls = newFileList.map(function (file) {
+                urls = _toConsumableArray(newFileList).map(function (file) {
                   return file.url;
                 }).join(splitStr);
                 onChange && onChange(urls);
-              } // setFileList(newFileList)
+              }
 
+              setFileList(_toConsumableArray(newFileList));
 
-            case 2:
+            case 3:
             case "end":
               return _context.stop();
           }
@@ -2446,7 +2521,7 @@ function Index$1(_ref, ref) {
 
   var request = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(options) {
-      var onSuccess, onError, file, onProgress, url, fileObj, newFileList;
+      var onSuccess, onError, file, onProgress, url, fileObj;
       return regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
@@ -2468,9 +2543,9 @@ function Index$1(_ref, ref) {
                   thumbUrl: url,
                   originFileObj: file,
                   xhr: onProgress
-                };
-                newFileList = [].concat(_toConsumableArray(fileList), [fileObj]);
-                setFileList(newFileList);
+                }; // const newFileList = [...fileList, fileObj]
+                // setFileList(newFileList);
+
                 onSuccess(url, file);
               }
 
@@ -7720,7 +7795,9 @@ var TabelCard = function TabelCard(props, ref) {
       valueType: 'option',
       align: 'center',
       render: function render(_, record, index) {
-        return tableActionDom(record, index);
+        return /*#__PURE__*/React__default['default'].createElement("div", {
+          className: "flex w100p jc-c ai-c"
+        }, tableActionDom(record, index));
       }
     }, optionColumnConfig)]).map(function (item) {
       var obj = _objectSpread2({}, item);

package/package.json

@@ -1,91 +1,91 @@
-{
-  "private": false,
-  "name": "wargerm",
-  "version": "0.7.17",
-  "scripts": {
-    "dev": "dumi dev",
-    "docs:build": "dumi build",
-    "docs:deploy": "gh-pages -d docs-dist",
-    "build": "father-build",
-    "deploy": "npm run docs:build && npm run docs:deploy",
-    "release": "npm run build && npm publish",
-    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
-    "test": "umi-test",
-    "test:coverage": "umi-test --coverage"
-  },
-  "main": "dist/index.js",
-  "module": "dist/index.esm.js",
-  "unpkg": "dist/index.umd.min.js",
-  "typings": "dist/index.d.ts",
-  "author": "jinly2",
-  "license": "MIT",
-  "keywords": [
-    "React",
-    "Component"
-  ],
-  "gitHooks": {
-    "pre-commit": "lint-staged"
-  },
-  "repository": {
-    "type": "git",
-    "url": "http://code.eblssmart.com/platform/web/wargerm-components.git",
-    "branch": "main"
-  },
-  "files": [
-    "dist",
-    "es",
-    "lib",
-    "index.css"
-  ],
-  "lint-staged": {
-    "*.{js,jsx,less,md,json}": [
-      "prettier --write"
-    ],
-    "*.ts?(x)": [
-      "prettier --parser=typescript --write"
-    ]
-  },
-  "dependencies": {
-    "@ant-design/pro-table": "^3.3.1",
-    "animate.css": "^4.1.1",
-    "dayjs": "^1.11.7",
-    "echarts": "^5.2.2",
-    "echarts-for-react": "^3.0.2",
-    "lodash-es": "^4.17.21",
-    "react-countup": "^6.0.0",
-    "react-dom": "^17.0.2",
-    "react-file-viewer": "^1.2.1",
-    "swiper": "^6.7.0",
-    "use-sync-external-store": "^1.2.0",
-    "xgplayer": "^2.31.6",
-    "xgplayer-flv": "^2.5.1",
-    "xgplayer-flv.js": "^2.3.0",
-    "xgplayer-hls": "^2.5.2",
-    "xgplayer-hls.js": "^2.6.1"
-  },
-  "peerDependencies": {
-    "@ant-design/icons": ">=4.2.0",
-    "antd": ">=4.7.0",
-    "classnames": ">=2.2.0",
-    "echarts": "^5.2.2",
-    "echarts-for-react": "^3.0.2",
-    "lodash-es": ">=4.17.21",
-    "react": ">=17.0.0"
-  },
-  "devDependencies": {
-    "@ant-design/icons": "^4.6.4",
-    "@types/lodash-es": "^4.17.6",
-    "@types/react-dom": "^17.0.11",
-    "@types/use-sync-external-store": "^0.0.3",
-    "@umijs/test": "^3.0.5",
-    "antd": "^5.2.2",
-    "classnames": "^2.3.1",
-    "dumi": "^1.1.31",
-    "father-build": "^1.19.1",
-    "gh-pages": "^3.0.0",
-    "lint-staged": "^10.0.7",
-    "prettier": "^1.19.1",
-    "react": "^16.12.0",
-    "yorkie": "^2.0.0"
-  }
+{
+  "private": false,
+  "name": "wargerm",
+  "version": "0.7.19",
+  "scripts": {
+    "dev": "dumi dev",
+    "docs:build": "dumi build",
+    "docs:deploy": "gh-pages -d docs-dist",
+    "build": "father-build",
+    "deploy": "npm run docs:build && npm run docs:deploy",
+    "release": "npm run build && npm publish",
+    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
+    "test": "umi-test",
+    "test:coverage": "umi-test --coverage"
+  },
+  "main": "dist/index.js",
+  "module": "dist/index.esm.js",
+  "unpkg": "dist/index.umd.min.js",
+  "typings": "dist/index.d.ts",
+  "author": "jinly2",
+  "license": "MIT",
+  "keywords": [
+    "React",
+    "Component"
+  ],
+  "gitHooks": {
+    "pre-commit": "lint-staged"
+  },
+  "repository": {
+    "type": "git",
+    "url": "http://code.eblssmart.com/platform/web/wargerm-components.git",
+    "branch": "main"
+  },
+  "files": [
+    "dist",
+    "es",
+    "lib",
+    "index.css"
+  ],
+  "lint-staged": {
+    "*.{js,jsx,less,md,json}": [
+      "prettier --write"
+    ],
+    "*.ts?(x)": [
+      "prettier --parser=typescript --write"
+    ]
+  },
+  "dependencies": {
+    "@ant-design/pro-table": "^3.3.1",
+    "animate.css": "^4.1.1",
+    "dayjs": "^1.11.7",
+    "echarts": "^5.2.2",
+    "echarts-for-react": "^3.0.2",
+    "lodash-es": "^4.17.21",
+    "react-countup": "^6.0.0",
+    "react-dom": "^17.0.2",
+    "react-file-viewer": "^1.2.1",
+    "swiper": "^6.7.0",
+    "use-sync-external-store": "^1.2.0",
+    "xgplayer": "^2.31.6",
+    "xgplayer-flv": "^2.5.1",
+    "xgplayer-flv.js": "^2.3.0",
+    "xgplayer-hls": "^2.5.2",
+    "xgplayer-hls.js": "^2.6.1"
+  },
+  "peerDependencies": {
+    "@ant-design/icons": ">=4.2.0",
+    "antd": ">=4.7.0",
+    "classnames": ">=2.2.0",
+    "echarts": "^5.2.2",
+    "echarts-for-react": "^3.0.2",
+    "lodash-es": ">=4.17.21",
+    "react": ">=17.0.0"
+  },
+  "devDependencies": {
+    "@ant-design/icons": "^4.6.4",
+    "@types/lodash-es": "^4.17.6",
+    "@types/react-dom": "^17.0.11",
+    "@types/use-sync-external-store": "^0.0.3",
+    "@umijs/test": "^3.0.5",
+    "antd": "^5.2.2",
+    "classnames": "^2.3.1",
+    "dumi": "^1.1.31",
+    "father-build": "^1.19.1",
+    "gh-pages": "^3.0.0",
+    "lint-staged": "^10.0.7",
+    "prettier": "^1.19.1",
+    "react": "^16.12.0",
+    "yorkie": "^2.0.0"
+  }
 }