awing-library 2.1.72-beta → 2.1.74-beta

package/lib/ACM-AXN/Page/CreateOrEdit/Utils.js

@@ -215,6 +215,8 @@ function updateStateByPageModel(pageModel) {
     }));
 }
 exports.updateStateByPageModel = updateStateByPageModel;
+var getFieldsValue = function (template) {
+};
 /**
  * Retrieves the template data based on the provided template parameters, view information data, page ID, and view number.
  *
@@ -230,6 +232,15 @@ var getTemplateDatas = function (templateParameters, viewInfoData, pageId, viewN
             ? viewInfoData.viewDatas.find(function (el) { return el.fieldName === parameter.fieldName; })
             : null;
         var valData = tempData ? tempData.fieldValue : null;
+        var child = {};
+        getChilds(parameter, function (item) {
+            var keys = item.fieldName.split('.');
+            if (keys.length > 1) {
+                console.log("item.fieldValue", item.fieldValue);
+                child[keys.at(-1)] = item.fieldValue;
+            }
+        });
+        console.log("child", child);
         var fieldValue = valData !== null && valData !== void 0 ? valData : (parameter.defaultValue ? parameter.defaultValue : '');
         fieldValue = (0, exports.convertValueByType)(parameter.fieldType, fieldValue);
         return {

package/lib/ACM-AXN/TaskScheduler/CreateOrEdit.js

@@ -151,9 +151,7 @@ var CreateOrEdit = function () {
                                     onChange: function (_k, name) {
                                         handleJobActionChange(jobActions.filter(function (x) { return x.name === name; })[0]);
                                         handleChange('jobAction', name);
-                                    }, value: jobModel.jobAction, children: jobActions.map(function (item) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: item.name, children: item.name }, item.name)); }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 8, style: { marginTop: '16px' }, children: (jobModel === null || jobModel === void 0 ? void 0 : jobModel.inputParameters) && ((0, jsx_runtime_1.jsx)(InputParameters_1.default, { inputParameters: jobModel === null || jobModel === void 0 ? void 0 : jobModel.inputParameters, jobActionSelected: jobActionSelected, handleInputParamChange: handleInputParamChange })) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 6, children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 6, style: { paddingRight: '10px' }, children: (0, jsx_runtime_1.jsx)(BasicInput_1.default, { fullWidth: true, name: "authUsername", required: false, label: t('User.Username'), checkValid: function (value) {
-                                                    return (0, validation_1.textValidation)(value, 50, false);
-                                                }, onChange: handleChange, value: jobModel.authUsername }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 5, style: { paddingRight: '10px' }, children: (0, jsx_runtime_1.jsx)(BasicInput_1.default, { fullWidth: true, autoComplete: "current-password", name: "authPassword", type: "password", required: false, label: t('User.Password'), onChange: handleChange, value: jobModel.authPassword }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 1, children: (0, jsx_runtime_1.jsx)(material_1.Tooltip, { placement: "top", title: t('TaskScheduler.Help.Authen'), arrow: true, children: (0, jsx_runtime_1.jsx)(icons_material_1.HelpOutline, { fontSize: "small", color: "action", style: {
+                                    }, value: jobModel.jobAction, children: jobActions.map(function (item) { return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, { value: item.name, children: item.name }, item.name)); }) }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 8, style: { marginTop: '16px' }, children: (jobModel === null || jobModel === void 0 ? void 0 : jobModel.inputParameters) && ((0, jsx_runtime_1.jsx)(InputParameters_1.default, { inputParameters: jobModel === null || jobModel === void 0 ? void 0 : jobModel.inputParameters, jobActionSelected: jobActionSelected, handleInputParamChange: handleInputParamChange })) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 6, children: (0, jsx_runtime_1.jsxs)(material_1.Grid, { container: true, children: [(0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 6, style: { paddingRight: '10px' }, children: (0, jsx_runtime_1.jsx)(BasicInput_1.default, { fullWidth: true, name: "authUsername", required: false, label: t('User.Username'), checkValid: function (value) { return (0, validation_1.textValidation)(value, 150, false, /^[a-zA-Z0-9\/\-_.@()\[\] ]+$/g, false); }, onChange: handleChange, value: jobModel.authUsername }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 5, style: { paddingRight: '10px' }, children: (0, jsx_runtime_1.jsx)(BasicInput_1.default, { fullWidth: true, autoComplete: "current-password", name: "authPassword", type: "password", required: false, label: t('User.Password'), onChange: handleChange, value: jobModel.authPassword }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, xs: 1, children: (0, jsx_runtime_1.jsx)(material_1.Tooltip, { placement: "top", title: t('TaskScheduler.Help.Authen'), arrow: true, children: (0, jsx_runtime_1.jsx)(icons_material_1.HelpOutline, { fontSize: "small", color: "action", style: {
                                                         marginTop: '20px',
                                                         marginLeft: '-10px',
                                                     } }) }) })] }) })] }) }), (0, jsx_runtime_1.jsx)(material_1.Grid, { item: true, children: (0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { name: "status", checked: jobModel.status, onChange: function (event) {

package/lib/ACM-AXN/TaskScheduler/Utils.js

@@ -12,6 +12,8 @@ exports.cloneValue = exports.getFormValidation = void 0;
 var Enums_1 = require("./Enums");
 var getFormValidation = function (job, jobValid) {
     var isValid = false;
+    if (!Object.values(jobValid).length)
+        return true;
     if (job.jobType === Enums_1.JobTypeEnum.Trigger) {
         isValid =
             (Boolean(job.triggerTopic) ||
@@ -27,7 +29,10 @@ var getFormValidation = function (job, jobValid) {
             (jobValid['cronTime'] !== undefined &&
                 jobValid['cronTime'])) && job.inputParameters.length > 0;
     }
-    return isValid && jobValid['name'] !== undefined && jobValid['name'] && (jobValid['authUsername'] === undefined || jobValid['authUsername']);
+    if (jobValid['name'] !== undefined) {
+        isValid = isValid && jobValid['name'];
+    }
+    return isValid && (jobValid['authUsername'] === undefined || jobValid['authUsername']);
 };
 exports.getFormValidation = getFormValidation;
 var cloneValue = function (item) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "awing-library",
-  "version": "2.1.72-beta",
+  "version": "2.1.74-beta",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",