@quansitech/antd-admin 1.1.3 → 1.1.5

package/dist/lib/helpers.js

@@ -8,12 +8,12 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 import { router } from "@inertiajs/react";
-import Schema from '@rc-component/async-validator';
 import http from "./http";
 import container from "./container";
-import React, { lazy } from "react";
+import React, { Suspense } from "react";
 import global from "./global";
 import { ModalContext } from "../components/ModalContext";
+import { uniq } from "lodash";
 export function replaceUrl(url, params) {
   return url.replace(/__([\w]+)__/g, function (match, key) {
     return params[key] || match;
@@ -37,53 +37,6 @@ export function replaceParams(params, data) {
 export function routerNavigateTo(url, config) {
   return router.visit(url, _objectSpread({}, config));
 }
-export function handleRules(dataRules, data) {
-  return new Promise(function (resolve) {
-    var validator = new Schema(dataRules);
-    validator.validate(data, function (errors, fields) {
-      if (errors) {
-        resolve(false);
-        return;
-      }
-      resolve(true);
-    });
-  });
-}
-export function asyncFilter(_x, _x2) {
-  return _asyncFilter.apply(this, arguments);
-}
-function _asyncFilter() {
-  _asyncFilter = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(arr, predicate) {
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.next = 2;
-          return Promise.all(arr.map(predicate)).then(function (results) {
-            return arr.filter(function (_v, index) {
-              return results[index];
-            });
-          });
-        case 2:
-          return _context.abrupt("return", _context.sent);
-        case 3:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return _asyncFilter.apply(this, arguments);
-}
-export function filterObjectKeys(obj, keysToKeep) {
-  if (_typeof(obj) !== 'object' || !obj) {
-    return obj;
-  }
-  return Object.keys(obj).filter(function (key) {
-    return !keysToKeep.includes(key);
-  }).reduce(function (newObj, key) {
-    newObj[key] = obj[key];
-    return newObj;
-  }, {});
-}
 export function createScript(url) {
   var scriptTags = window.document.querySelectorAll('script');
   var len = scriptTags.length;
@@ -103,21 +56,21 @@ export function createScript(url) {
     document.body.appendChild(node);
   });
 }
-export function modalShow(_x3) {
+export function modalShow(_x) {
   return _modalShow.apply(this, arguments);
 }
 function _modalShow() {
-  _modalShow = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(options) {
+  _modalShow = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
     var props, res, Component, _afterClose, modal;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
         case 0:
           props = options.content.props;
           if (!options.content.url) {
-            _context2.next = 8;
+            _context.next = 8;
             break;
           }
-          _context2.next = 4;
+          _context.next = 4;
           return http({
             method: 'get',
             url: options.content.url,
@@ -126,9 +79,9 @@ function _modalShow() {
             }
           });
         case 4:
-          res = _context2.sent;
+          res = _context.sent;
           if (!(typeof res.data === 'string')) {
-            _context2.next = 7;
+            _context.next = 7;
             break;
           }
           throw new Error('modal response is not vail');
@@ -136,14 +89,12 @@ function _modalShow() {
           props = res.data;
         case 8:
           if (props) {
-            _context2.next = 10;
+            _context.next = 10;
             break;
           }
           throw new Error('modal props is empty');
         case 10:
-          Component = /*#__PURE__*/lazy(function () {
-            return container.get('Modal.' + upperFirst(props.type));
-          });
+          Component = container.get('Modal.' + upperFirst(props.type));
           _afterClose = function afterClose() {};
           modal = global.modal.info(_objectSpread(_objectSpread({}, options), {}, {
             closable: true,
@@ -161,23 +112,77 @@ function _modalShow() {
                   _afterClose = callback;
                 }
               }
-            }, /*#__PURE__*/React.createElement(Component, props)),
+            }, /*#__PURE__*/React.createElement(Suspense, null, /*#__PURE__*/React.createElement(Component, props))),
             afterClose: function afterClose() {
               _afterClose && _afterClose();
             }
           }));
-          return _context2.abrupt("return", {
+          return _context.abrupt("return", {
             destroy: modal.destroy,
             update: modal.update
           });
         case 14:
         case "end":
-          return _context2.stop();
+          return _context.stop();
       }
-    }, _callee2);
+    }, _callee);
   }));
   return _modalShow.apply(this, arguments);
 }
 export function upperFirst(str) {
   return str.charAt(0).toUpperCase() + str.slice(1);
+}
+export function getProValueTypeMap() {
+  var columnKeys = Object.keys(container.list('Column.'));
+  var readonlyKeys = Object.keys(container.list('Column.Readonly.'));
+  var types = uniq(columnKeys.concat(readonlyKeys));
+  return types.reduce(function (map, type) {
+    map[type] = {
+      render: function render(text, props) {
+        var renderComponent = 'Column.Readonly.' + upperFirst(type);
+        if (container.check(renderComponent)) {
+          var Component = container.get(renderComponent);
+          return /*#__PURE__*/React.createElement(Suspense, null, /*#__PURE__*/React.createElement(Component, props));
+        }
+        return /*#__PURE__*/React.createElement(React.Fragment, null, text);
+      },
+      renderFormItem: function renderFormItem(text, props) {
+        var renderComponent = 'Column.' + upperFirst(type);
+        if (container.check(renderComponent)) {
+          var Component = container.get(renderComponent);
+          return /*#__PURE__*/React.createElement(Suspense, null, /*#__PURE__*/React.createElement(Component, props));
+        }
+        return /*#__PURE__*/React.createElement(React.Fragment, null, text);
+      }
+    };
+    return map;
+  }, {});
+}
+export function handleCondition(condition, data) {
+  switch (condition.operator) {
+    case 'eq':
+    case '=':
+      return data[condition.field] == condition.value;
+    case 'neq':
+    case '!=':
+    case '<>':
+      return data[condition.field] != condition.value;
+    case 'gt':
+    case '>':
+      return data[condition.field] > condition.value;
+    case 'gte':
+    case '>=':
+      return data[condition.field] >= condition.value;
+    case 'lt':
+    case '<':
+      return data[condition.field] < condition.value;
+    case 'elt':
+    case '<=':
+      return data[condition.field] <= condition.value;
+    case 'in':
+      return data[condition.field] && condition.value.includes(data[condition.field]);
+    case 'not in':
+      return data[condition.field] && !condition.value.includes(data[condition.field]);
+  }
+  return false;
 }

package/dist/lib/http.js

@@ -13,6 +13,7 @@ http.interceptors.request.use(function (config) {
   config.headers['X-Requested-With'] = 'XMLHttpRequest';
   return config;
 });
+var timer;
 http.interceptors.response.use(function (response) {
   var _response$config$fetc;
   var checkInfo = function checkInfo(data) {
@@ -37,8 +38,12 @@ http.interceptors.response.use(function (response) {
   }
   var showInfo = checkInfo(response.data);
   if (response.data.url) {
-    setTimeout(function () {
+    if (timer) {
+      clearTimeout(timer);
+    }
+    timer = setTimeout(function () {
       routerNavigateTo(response.data.url);
+      timer = null;
     }, showInfo ? 2000 : 0);
   }
   if (response.data.status == 0) {

package/dist/lib/schemaHandler.js

@@ -8,6 +8,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import http from "./http";
+import { handleCondition } from "./helpers";
 var uploadValidator = function uploadValidator(_, value) {
   return new Promise(function (resolve, reject) {
     if (!value) {
@@ -80,6 +81,7 @@ export var schemaHandler = {
     schema.formItemProps.rules.push({
       validator: uploadValidator
     });
+    schema.fieldProps.dataIndex = schema.dataIndex;
     return _objectSpread(_objectSpread({}, schema), {}, {
       transform: uploadTransform
     });
@@ -88,28 +90,80 @@ export var schemaHandler = {
     schema.formItemProps.rules.push({
       validator: uploadValidator
     });
+    schema.fieldProps.dataIndex = schema.dataIndex;
     return _objectSpread(_objectSpread({}, schema), {}, {
       transform: uploadTransform
     });
   },
+  action: function action(schema) {
+    schema.fieldProps = {
+      actions: schema.actions
+    };
+    return schema;
+  },
+  dependency: function dependency(schema) {
+    var _columns = schema.columns,
+      valueType = schema.valueType;
+    return {
+      valueType: valueType,
+      name: [schema.showCondition.field],
+      columns: function columns(fields) {
+        return handleCondition(schema.showCondition, fields) ? _columns : [];
+      }
+    };
+  },
+  ueditor: function ueditor(schema) {
+    if (!schema.formItemProps) {
+      schema.formItemProps = {};
+    }
+    if (!schema.formItemProps.rules) {
+      schema.formItemProps.rules = [];
+    }
+    schema.formItemProps.rules.push({
+      validator: function () {
+        var _validator = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(rule, value) {
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                if (!(value.slice(0, 7) === '[抓取图片中]')) {
+                  _context.next = 2;
+                  break;
+                }
+                throw new Error('请等待图片抓取完成');
+              case 2:
+                return _context.abrupt("return", true);
+              case 3:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        }));
+        function validator(_x, _x2) {
+          return _validator.apply(this, arguments);
+        }
+        return validator;
+      }()
+    });
+    return _objectSpread({}, schema);
+  },
   select: function select(schema) {
     var _schema$fieldProps;
     schema.searchOnChange = true;
     if ((_schema$fieldProps = schema.fieldProps) !== null && _schema$fieldProps !== void 0 && _schema$fieldProps.searchUrl) {
       return _objectSpread(_objectSpread({}, schema), {}, {
         request: function () {
-          var _request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
+          var _request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
             var res;
-            return _regeneratorRuntime().wrap(function _callee$(_context) {
-              while (1) switch (_context.prev = _context.next) {
+            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+              while (1) switch (_context2.prev = _context2.next) {
                 case 0:
-                  _context.next = 2;
+                  _context2.next = 2;
                   return http(schema.fieldProps.searchUrl, {
                     params: params
                   });
                 case 2:
-                  res = _context.sent;
-                  return _context.abrupt("return", res.data.map(function (item) {
+                  res = _context2.sent;
+                  return _context2.abrupt("return", res.data.map(function (item) {
                     return {
                       label: item.label || item.value,
                       value: item.value
@@ -117,11 +171,11 @@ export var schemaHandler = {
                   }));
                 case 4:
                 case "end":
-                  return _context.stop();
+                  return _context2.stop();
               }
-            }, _callee);
+            }, _callee2);
           }));
-          function request(_x) {
+          function request(_x3) {
             return _request.apply(this, arguments);
           }
           return request;

package/dist/lib/writeExtra.js

@@ -20,7 +20,7 @@ export default function () {
   var extra_script = "\nimport {container} from \"@quansitech/antd-admin\";\n\n".concat(extras.map(function (e) {
     var cs = [];
     for (var componentKey in e.component) {
-      cs.push("container.register('".concat(componentKey, "', () => import('../../../vendor").concat(path.join('/', e.path, e.component[componentKey]), "'));"));
+      cs.push("container.register('".concat(componentKey, "', ()=>import('../../../vendor").concat(path.join('/', e.path, e.component[componentKey]), "'));"));
     }
     return cs.join('\n');
   }), "\n");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quansitech/antd-admin",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "type": "module",
   "files": [
     "dist"
@@ -25,6 +25,7 @@
     "@types/react": "^18.3.0",
     "@types/react-dom": "^18.3.0",
     "father": "^4.5.1",
+    "jest": "^29.7.0",
     "sass-embedded": "^1.80.6",
     "typescript": "^5.6.3"
   },