@kmkf-fe-packages/kmkf-utils 2.0.79-beta.31 → 2.0.79-beta.32

package/dist/esm/constants/constant.js

@@ -125,7 +125,7 @@ export var SYMBOL = {
   EQ: 'eq'
 };
 export var hasAddNullComponent = ['RADIO', 'SELECT', 'CHECKBOX', 'BASIC_MULT_SELECT', 'FLOW_TAG', 'WAREHOUSING_STATUS', 'BS_E3_WAREHOUSING_STATUS', 'ADJUST_WORK_ORDER_STATUS', 'REISSUE_STATUS', 'INVOICE_STATUS', 'INVOICING_STATUS', 'MSG_STATUS', 'AGREE_REFUND_STATUS', 'ERP_AFTER_SALE_STATUS', 'REJECT_REFUND_STATUS', 'LOGISTICS_INTERCEPTION', 'AGREE_RETURN_GOODS_STATUS', 'REJECT_RETURN_GOODS_STATUS', 'RETURN_EXCHANGE_GOODS_REVIEW_STATUS', 'GY_PAYMENT_METHOD'];
-export var SelectInputComponent = ['INPUT', 'RETURN_GOODS_STATUS', 'EXCHANGE_STATUS', 'BS_LOGISTICS', 'WLN_LOGISTICS', 'WDT_LOGISTICS', 'KM_LOGISTICS', 'GY_LOGISTICS', 'JST_LOGISTICS', 'AFTER_SALES_ORDER_ID'];
+export var SelectInputComponent = ['INPUT', 'TEXTAREA', 'SHOP_NAME_INPUT', 'BUYER_NICK_INPUT', 'RECEIVER_NAME_INPUT', 'REMARK_INPUT', 'RETURN_GOODS_STATUS', 'EXCHANGE_STATUS', 'BS_LOGISTICS', 'WLN_LOGISTICS', 'WDT_LOGISTICS', 'KM_LOGISTICS', 'GY_LOGISTICS', 'JST_LOGISTICS', 'AFTER_SALES_ORDER_ID'];
 
 // 表单默认值
 export var INIT_FORM_VALUE = {

package/dist/esm/utils/finalFormData.js

@@ -1,3 +1,4 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 import moment from 'moment';
 import { hasAddNullComponent, SYMBOL, INIT_FORM_VALUE, SelectInputComponent } from "../constants/constant";
 import isNull from "./isNull";
@@ -101,22 +102,24 @@ export var finalFormData = function finalFormData(_ref) {
             key: (_fieldFilterOption$fi3 = fieldFilterOption === null || fieldFilterOption === void 0 ? void 0 : fieldFilterOption.filterKey) !== null && _fieldFilterOption$fi3 !== void 0 ? _fieldFilterOption$fi3 : nxt,
             symbol: type == 'isNull' ? 'isnull' : 'notnull'
           });
+        } else if (!keywords) {
+          return cur;
         }
       }
       if (isNull(formData === null || formData === void 0 ? void 0 : formData[nxt])) return cur;
       if (Reflect.has(fieldFilterOption, 'componentDataType')) {
-        var _fieldFilterOption$fi4;
+        var _fieldFilterOption$fi4, _formData$nxt5;
         cur.push({
           key: (_fieldFilterOption$fi4 = fieldFilterOption === null || fieldFilterOption === void 0 ? void 0 : fieldFilterOption.filterKey) !== null && _fieldFilterOption$fi4 !== void 0 ? _fieldFilterOption$fi4 : nxt,
-          symbol: fieldFilterOption.searchDefaultConditions,
+          symbol: _typeof(fieldFilterOption.searchDefaultConditions) === 'object' ? fieldFilterOption.searchDefaultConditions[formData === null || formData === void 0 ? void 0 : (_formData$nxt5 = formData[nxt]) === null || _formData$nxt5 === void 0 ? void 0 : _formData$nxt5.type] : fieldFilterOption.searchDefaultConditions,
           componentDataType: fieldFilterOption.componentDataType,
           value: typeof fieldFilterOption.formatFilterValue === 'function' ? fieldFilterOption.formatFilterValue(formData === null || formData === void 0 ? void 0 : formData[nxt]) : formData === null || formData === void 0 ? void 0 : formData[nxt]
         });
       } else {
-        var _fieldFilterOption$fi5;
+        var _fieldFilterOption$fi5, _formData$nxt6;
         cur.push({
           key: (_fieldFilterOption$fi5 = fieldFilterOption === null || fieldFilterOption === void 0 ? void 0 : fieldFilterOption.filterKey) !== null && _fieldFilterOption$fi5 !== void 0 ? _fieldFilterOption$fi5 : nxt,
-          symbol: fieldFilterOption.searchDefaultConditions,
+          symbol: _typeof(fieldFilterOption.searchDefaultConditions) === 'object' ? fieldFilterOption.searchDefaultConditions[formData === null || formData === void 0 ? void 0 : (_formData$nxt6 = formData[nxt]) === null || _formData$nxt6 === void 0 ? void 0 : _formData$nxt6.type] : fieldFilterOption.searchDefaultConditions,
           value: typeof fieldFilterOption.formatFilterValue === 'function' ? fieldFilterOption.formatFilterValue(formData === null || formData === void 0 ? void 0 : formData[nxt]) : formData === null || formData === void 0 ? void 0 : formData[nxt]
         });
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.0.79-beta.31",
+  "version": "2.0.79-beta.32",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d1f37541a6bace12210719ab15c217eafbedb00e",
+  "gitHead": "51eaa2a2654100916f47f1dc2f32c3844cf9fb7a",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }