awing-library 2.1.2-stage → 2.1.3-stage

package/lib/ACM-AXN/Campaign/CreateOrEdit/TabSubCampaign/SubCampaignDetail.js

@@ -125,7 +125,7 @@ function SubCampaignDetail(props) {
                                         ? subCampaign.bonusAmount < 0
                                             ? translationText.notNegative
                                             : translationText.helperText
-                                        : '' }) }), service.attributesGetByObjectTypeCode ? ((0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, style: { padding: 8 }, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "billingUnit", required: true, select: true, variant: "standard", fullWidth: true, label: translationText.BillingUnit, value: String(subCampaign.billingUnit), onChange: function (e) {
+                                        : '' }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, style: { padding: 8 }, children: (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "billingUnit", required: true, select: true, variant: "standard", fullWidth: true, label: translationText.BillingUnit, value: String(subCampaign.billingUnit), onChange: function (e) {
                                         onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { billingUnit: Number(e.target.value) })); });
                                     }, error: subValid.billingUnit !== undefined &&
                                         !subValid.billingUnit, helperText: subValid.billingUnit !== undefined &&
@@ -133,7 +133,7 @@ function SubCampaignDetail(props) {
                                         ? translationText.helperText
                                         : '', children: Object.values(Enum_2.AnalyticType)
                                         .filter(function (item) { return !isNaN(Number(item)); })
-                                        .map(function (type) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: type, children: t("Campaign.BillingUnit.".concat((0, lodash_1.capitalize)((0, lodash_1.camelCase)(Enum_2.AnalyticType[type])))) }, type)); }) }) })) : null] })), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, style: { padding: 8 }, children: (0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { checked: subCampaign.isReserved, onChange: function (e) {
+                                        .map(function (type) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: type, children: t("Campaign.BillingUnit.".concat((0, lodash_1.capitalize)((0, lodash_1.camelCase)(Enum_2.AnalyticType[type])))) }, type)); }) }) })] })), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 4, style: { padding: 8 }, children: (0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { checked: subCampaign.isReserved, onChange: function (e) {
                                     e.persist();
                                     onSubCampaignChange(function (pre) { return (__assign(__assign({}, pre), { isReserved: e.target.checked })); });
                                 }, name: "isReserved", color: "primary" }), label: translationText.reserved, style: { marginTop: 6 } }) })] })] }));

package/lib/ACM-AXN/ViewTemplate/TemplateField/Fields/BasicField/index.js

@@ -107,9 +107,12 @@ function BasicField(props) {
     var renderField = function () {
         // const isError = !!getValueByPath(/*errors*/ {}, fieldPath)
         var isError = errors.includes(fieldPath);
-        var field = register(fieldPath, __assign({ required: isRequired }, fieldType === Enum_1.TYPE_FIELD_TEMPLATE.URL && {
-            onValidate: function (value) { return (0, validation_1.urlValid)(value); }
+        var field = register(fieldPath, __assign(__assign({ required: isRequired }, fieldType === Enum_1.TYPE_FIELD_TEMPLATE.URL && {
+            onValidate: validation_1.urlValid
+        }), fieldType === Enum_1.TYPE_FIELD_TEMPLATE.COLOR && {
+            onValidate: validation_1.colorValid
         }));
+        // onChangeViewValid(isError)
         switch (fieldType) {
             case Enum_1.TYPE_FIELD_TEMPLATE.TEXT_FIELD_NUMBER:
             case Enum_1.TYPE_FIELD_TEMPLATE.TEXT_FIELD:
@@ -238,10 +241,7 @@ var getValidationParams = function (templateDatas, pagePath, configs) {
 var runValidate = debounce(function (scriptValidate, fields, pagePath, notifyError, changeViewValidStatus, changeViewValidProcess, configs) {
     if (scriptValidate) {
         changeViewValidProcess(Enum_1.VALIDATE_PROCESS_CODE.VALIDATING);
-        var params = getValidationParams(fields, pagePath, configs);
-        (0, common_1.runScript)(
-        // getValidationParams(fields, pagePath, configs),
-        params, scriptValidate).then(function (result) {
+        (0, common_1.runScript)(getValidationParams(fields, pagePath, configs), scriptValidate).then(function (result) {
             if (result) {
                 var fieldsError_1 = [];
                 var newAnswer = result.map(function (validInfo) {

package/lib/AWING/Form/useForm.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="lodash" />
 import React from 'react';
 import { FieldOptions } from './Utils/Types';
 export declare const useForm: (props: {
@@ -17,7 +18,7 @@ export declare const useForm: (props: {
         onBlur(e: React.FocusEvent<HTMLInputElement | HTMLTextAreaElement, Element>): void;
     };
     watch: () => any;
-    getValues: (fieldNames: string | string[]) => any;
+    getValues: ((fieldNames: string | string[]) => any) & import("lodash").MemoizedFunction;
     control: {
         _getFieldArray: <T>(name: string) => Partial<T>[];
         _updateFieldArray: (name: string, value: unknown) => void;

package/lib/AWING/Form/useForm.js

@@ -23,6 +23,7 @@ var compact_1 = __importDefault(require("./Utils/compact"));
 var get_1 = __importDefault(require("./Utils/get"));
 var convertToArrayPayload_1 = __importDefault(require("./Utils/convertToArrayPayload"));
 var cloneProxy_1 = __importDefault(require("./Utils/cloneProxy"));
+var lodash_1 = require("lodash");
 var useForm = function (props) {
     var defaultValue = props.defaultValue;
     var isMount = (0, useMounted_1.default)();
@@ -53,7 +54,8 @@ var useForm = function (props) {
     var _updateFieldArray = function (name, value) {
         (0, set_1.default)(_formControl.current, name, value);
     };
-    var getValues = function (fieldNames) {
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    var getValues = react_1.default.useCallback((0, lodash_1.memoize)(function (fieldNames) {
         var data = (0, convertToArrayPayload_1.default)(fieldNames).map(function (fieldName) {
             return (0, cloneProxy_1.default)((0, get_1.default)(_formControl.current, fieldName));
         });
@@ -61,7 +63,7 @@ var useForm = function (props) {
             return data;
         if (data.length && data.length === 1)
             return data[0];
-    };
+    }), []);
     var register = function (fieldPath, options) {
         var isRequired = options === null || options === void 0 ? void 0 : options.required;
         var onValidate = options === null || options === void 0 ? void 0 : options.onValidate;

package/lib/AWING/ultis/validation.d.ts

@@ -10,6 +10,7 @@ export declare function dateRangeValid(value: (Date | null | undefined)[] | null
 export declare function emailValid(value: string | null | undefined): boolean;
 export declare function numberOnlyValid(value: string | null | undefined): boolean;
 export declare function urlValid(value: string | null | undefined): boolean;
+export declare function colorValid(value: string | null | undefined): boolean;
 export declare function passwordValid(value: string | null | undefined): boolean;
 export declare function containsOnlyDigits(str: string): boolean;
 export declare function logicExpressionValid(value: string | null | undefined): boolean;

package/lib/AWING/ultis/validation.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.textValidation = exports.logicExpressionValid = exports.containsOnlyDigits = exports.passwordValid = exports.urlValid = exports.numberOnlyValid = exports.emailValid = exports.dateRangeValid = exports.dateValid = exports.notNullValid = exports.stringNullableValid = exports.stringNotNullValid = exports.numberNotNullValid = exports.numberPercentageNotNullValid = exports.positiveNumberNotNullValid = exports.arrayIsNotEmptyValid = void 0;
+exports.textValidation = exports.logicExpressionValid = exports.containsOnlyDigits = exports.passwordValid = exports.colorValid = exports.urlValid = exports.numberOnlyValid = exports.emailValid = exports.dateRangeValid = exports.dateValid = exports.notNullValid = exports.stringNullableValid = exports.stringNotNullValid = exports.numberNotNullValid = exports.numberPercentageNotNullValid = exports.positiveNumberNotNullValid = exports.arrayIsNotEmptyValid = void 0;
 /* eslint-disable no-useless-escape */
 var i18n_1 = __importDefault(require("../../i18n"));
 var lodash_1 = __importDefault(require("lodash"));
@@ -69,6 +69,11 @@ function urlValid(value) {
     }
 }
 exports.urlValid = urlValid;
+function colorValid(value) {
+    var re = /^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/;
+    return value !== undefined && value !== null && re.test('#' + value);
+}
+exports.colorValid = colorValid;
 function passwordValid(value) {
     var re = /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$/;
     return value === undefined && value === null && re.test(value);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "awing-library",
-    "version": "2.1.2-stage",
+    "version": "2.1.3-stage",
     "description": "",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",