@quansitech/antd-admin 1.1.45 → 1.1.47

package/dist/lib/helpers.d.ts

@@ -1,4 +1,5 @@
 import { VisitOptions } from "@inertiajs/core/types/types";
+import React from "react";
 import { ModalFuncProps } from "antd";
 import { Condition, ModalOptions } from "../types";
 export declare function replaceUrl(url: string, params: any): string;
@@ -17,3 +18,4 @@ export declare function filterObjectKeys(obj: Record<string, any>, keysToFilter:
 export declare function diffTree(tree1: any[], tree2: any[], childKey: string): any[];
 export declare function findValuePath(obj: any, target: any, path?: string[]): string[] | null;
 export declare function getValueByPath(obj: any, path: string[]): any;
+export declare function renderTextarea(text: string): React.JSX.Element;

package/dist/lib/helpers.js

@@ -289,4 +289,11 @@ export function getValueByPath(obj, path) {
     _iterator.f();
   }
   return current;
+}
+export function renderTextarea(text) {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    style: {
+      whiteSpace: 'pre-wrap'
+    }
+  }, text));
 }

package/dist/lib/schemaHandler.js

@@ -8,7 +8,7 @@ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyri
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import http from "./http";
-import { deepSet, handleCondition } from "./helpers";
+import { deepSet, handleCondition, renderTextarea } from "./helpers";
 import container from "./container";
 import { itemRender } from "./FormList";
 import { lowerFirst } from "es-toolkit";
@@ -31,6 +31,43 @@ var uploadValidator = function uploadValidator(_, value) {
     resolve(true);
   });
 };
+var handleUploadRules = function handleUploadRules(rules) {
+  var rRule = rules.find(function (rule) {
+    return rule.required;
+  });
+  if (rRule) {
+    rules.push({
+      validator: function () {
+        var _validator = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_, value) {
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                if (!(value === '0' || value === 0)) {
+                  _context.next = 2;
+                  break;
+                }
+                throw new Error(rRule.message);
+              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;
+      }()
+    });
+  }
+  rules.push({
+    validator: uploadValidator
+  });
+  console.log(rules);
+  return rules;
+};
 export var commonHandler = function commonHandler(schema) {
   var _schema$formItemProps;
   schema.valueType = lowerFirst(schema.valueType);
@@ -52,22 +89,22 @@ export var commonHandler = function commonHandler(schema) {
   if (!((_schema$formItemProps = schema.formItemProps) !== null && _schema$formItemProps !== void 0 && _schema$formItemProps.rules)) {
     deepSet(schema, 'formItemProps.rules', []);
   }
-  schema.fieldProps.withValidator = function (_validator) {
+  schema.fieldProps.withValidator = function (_validator2) {
     schema.formItemProps.rules.push({
       validator: function validator(rules, value) {
-        return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-          return _regeneratorRuntime().wrap(function _callee$(_context) {
-            while (1) switch (_context.prev = _context.next) {
+        return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+            while (1) switch (_context2.prev = _context2.next) {
               case 0:
-                _context.next = 2;
-                return _validator(value);
+                _context2.next = 2;
+                return _validator2(value);
               case 2:
-                return _context.abrupt("return", true);
+                return _context2.abrupt("return", true);
               case 3:
               case "end":
-                return _context.stop();
+                return _context2.stop();
             }
-          }, _callee);
+          }, _callee2);
         }))();
       }
     });
@@ -105,17 +142,21 @@ export var schemaHandler = {
     }
     return _objectSpread({}, schema);
   },
+  textarea: function textarea(schema) {
+    schema.renderText = function (text) {
+      return renderTextarea(text);
+    };
+    return _objectSpread({}, schema);
+  },
   // 上传
   image: function image(schema) {
-    schema.formItemProps.rules.push({
-      validator: uploadValidator
-    });
+    var _schema$formItemProps2;
+    schema.formItemProps.rules = handleUploadRules((_schema$formItemProps2 = schema.formItemProps) === null || _schema$formItemProps2 === void 0 ? void 0 : _schema$formItemProps2.rules);
     return _objectSpread({}, schema);
   },
   file: function file(schema) {
-    schema.formItemProps.rules.push({
-      validator: uploadValidator
-    });
+    var _schema$formItemProps3;
+    schema.formItemProps.rules = handleUploadRules((_schema$formItemProps3 = schema.formItemProps) === null || _schema$formItemProps3 === void 0 ? void 0 : _schema$formItemProps3.rules);
     return _objectSpread({}, schema);
   },
   action: function action(schema) {
@@ -155,31 +196,31 @@ export var schemaHandler = {
     }
     schema.formItemProps.rules.push({
       validator: function () {
-        var _validator2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(rule, value) {
-          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-            while (1) switch (_context2.prev = _context2.next) {
+        var _validator3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(rule, value) {
+          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+            while (1) switch (_context3.prev = _context3.next) {
               case 0:
                 if (value) {
-                  _context2.next = 2;
+                  _context3.next = 2;
                   break;
                 }
-                return _context2.abrupt("return", true);
+                return _context3.abrupt("return", true);
               case 2:
                 if (!(value.slice(0, 7) === '[抓取图片中]')) {
-                  _context2.next = 4;
+                  _context3.next = 4;
                   break;
                 }
                 throw new Error('请等待图片抓取完成');
               case 4:
-                return _context2.abrupt("return", true);
+                return _context3.abrupt("return", true);
               case 5:
               case "end":
-                return _context2.stop();
+                return _context3.stop();
             }
-          }, _callee2);
+          }, _callee3);
         }));
-        function validator(_x, _x2) {
-          return _validator2.apply(this, arguments);
+        function validator(_x3, _x4) {
+          return _validator3.apply(this, arguments);
         }
         return validator;
       }()
@@ -192,18 +233,18 @@ export var schemaHandler = {
     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 _callee3(params) {
+          var _request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
             var res;
-            return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-              while (1) switch (_context3.prev = _context3.next) {
+            return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+              while (1) switch (_context4.prev = _context4.next) {
                 case 0:
-                  _context3.next = 2;
+                  _context4.next = 2;
                   return http(schema.fieldProps.searchUrl, {
                     params: params
                   });
                 case 2:
-                  res = _context3.sent;
-                  return _context3.abrupt("return", res.data.map(function (item) {
+                  res = _context4.sent;
+                  return _context4.abrupt("return", res.data.map(function (item) {
                     return {
                       label: item.label || item.value,
                       value: item.value
@@ -211,11 +252,11 @@ export var schemaHandler = {
                   }));
                 case 4:
                 case "end":
-                  return _context3.stop();
+                  return _context4.stop();
               }
-            }, _callee3);
+            }, _callee4);
           }));
-          function request(_x3) {
+          function request(_x5) {
             return _request.apply(this, arguments);
           }
           return request;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quansitech/antd-admin",
-  "version": "1.1.45",
+  "version": "1.1.47",
   "type": "module",
   "files": [
     "dist"