@zscreate/form-component 1.1.629 → 1.1.630

package/dist/form-component.umd.js

@@ -112194,12 +112194,13 @@ module.exports = function (iterator, fn, value, ENTRIES) {
 /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(pubsub_js__WEBPACK_IMPORTED_MODULE_10__);
 /* harmony import */ var _form_api_manage__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(5335);
 /* harmony import */ var _validateByApiMinxins__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(4096);
-/* harmony import */ var _zscreate_formula__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(8674);
-/* harmony import */ var _zscreate_formula__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(_zscreate_formula__WEBPACK_IMPORTED_MODULE_16__);
+/* harmony import */ var _zscreate_formula__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(8674);
+/* harmony import */ var _zscreate_formula__WEBPACK_IMPORTED_MODULE_17___default = /*#__PURE__*/__webpack_require__.n(_zscreate_formula__WEBPACK_IMPORTED_MODULE_17__);
 /* harmony import */ var moment__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(522);
 /* harmony import */ var moment__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(moment__WEBPACK_IMPORTED_MODULE_13__);
-/* harmony import */ var lodash_es__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(2863);
-/* harmony import */ var lodash_es__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(5265);
+/* harmony import */ var lodash_es__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(2863);
+/* harmony import */ var lodash_es__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(5265);
+/* harmony import */ var _form_utils_util__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(7031);
 
 
 
@@ -112219,6 +112220,7 @@ module.exports = function (iterator, fn, value, ENTRIES) {
 
 
 
+
 __webpack_require__.g.dictData = {};
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({
   inject: {
@@ -112360,7 +112362,7 @@ __webpack_require__.g.dictData = {};
     currUserInfo() {
       var _this$formContext2;
       const currUserInfo = this === null || this === void 0 || (_this$formContext2 = this.formContext) === null || _this$formContext2 === void 0 ? void 0 : _this$formContext2.currUserInfo;
-      return (0,lodash_es__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .A)(currUserInfo) ? undefined : currUserInfo;
+      return (0,lodash_es__WEBPACK_IMPORTED_MODULE_15__/* ["default"] */ .A)(currUserInfo) ? undefined : currUserInfo;
     },
     isDisabled() {
       return !this.isdisabled && this.widget.options.disabled;
@@ -112494,22 +112496,23 @@ __webpack_require__.g.dictData = {};
         // }
       }
     },
-    validateNumRange(rule, value, callback) {
-      debugger;
+    timeout: _form_utils_util__WEBPACK_IMPORTED_MODULE_14__.timeout,
+    async validateNumRange(rule, value, callback) {
+      await this.timeout(0);
       // rule.field.split('.')[1]修复this.tableIndex拿到的不对的问题，待排查☆
       let val = this.isCorrect ? value : this.tableKey ? this.models[this.tableKey][rule.field.split('.')[1]][this.widget.model] : this.dataModel;
       let options = this.widget.options;
       if (!options.maxValue && !options.minValue) {
-        callback();
+        return Promise.resolve();
       }
       if ((!val || Array.isArray(val)) && options.maxValue && options.minValue && options.minValue == options.maxValue && (!val || Array.isArray(val) && val.length != options.maxValue)) {
-        callback(new Error(this.widget.name + "只能选择" + options.maxValue + "项"));
+        return Promise.reject(this.widget.name + "只能选择" + options.maxValue + "项");
       } else if (Array.isArray(val) && options.maxValue && val.length > options.maxValue) {
-        callback(new Error(this.widget.name + "最多选择" + options.maxValue + "项"));
+        return Promise.reject(this.widget.name + "最多选择" + options.maxValue + "项");
       } else if (options.minValue && (!val || Array.isArray(val) && val.length < options.minValue)) {
-        callback(new Error(this.widget.name + "最少选择" + options.minValue + "项"));
+        return Promise.reject(this.widget.name + "最少选择" + options.minValue + "项");
       } else {
-        callback();
+        return Promise.resolve();
       }
     },
     getRecursionWidget() {
@@ -112652,7 +112655,7 @@ __webpack_require__.g.dictData = {};
       const keys = Object.keys(models);
       const formulaModels = keys.reduce((prev, curr) => {
         const key = `_widget_${curr}`;
-        prev[key] = (0,lodash_es__WEBPACK_IMPORTED_MODULE_15__/* ["default"] */ .A)(models[curr]);
+        prev[key] = (0,lodash_es__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .A)(models[curr]);
         const tableDatas = tableArr.filter(item => item[0] === key);
         if (tableDatas && Array.isArray(models[curr])) {
           tableDatas.forEach(tableData => {
@@ -112675,7 +112678,7 @@ __webpack_require__.g.dictData = {};
         ...msgData,
         that: this
       };
-      let result = _zscreate_formula__WEBPACK_IMPORTED_MODULE_16__.FormulaInstance.RUN(formula, formulaModels);
+      let result = _zscreate_formula__WEBPACK_IMPORTED_MODULE_17__.FormulaInstance.RUN(formula, formulaModels);
       if ([NaN].includes(result)) {
         result = '';
       }
@@ -120335,7 +120338,7 @@ const getSignature = params => (0,_form_api_manage__WEBPACK_IMPORTED_MODULE_0__/
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"rE":"1.1.629"};
+module.exports = {"rE":"1.1.630"};
 
 /***/ }),
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zscreate/form-component",
-  "version": "1.1.629",
+  "version": "1.1.630",
   "private": false,
   "description": "",
   "main": "dist/form-component.umd.js",