@sutech_jp/raas-react-client 0.1.31 → 0.1.33

package/dist/types/webform.d.ts

@@ -1,4 +1,3 @@
-import { ReactNode } from 'react';
 export declare type ItemValue = string | number | boolean | Date | null;
 export declare type ObjectValue = {
     [key: string]: ItemValue | ObjectValue | ArrayValue;
@@ -6,10 +5,14 @@ export declare type ObjectValue = {
 export declare type ArrayValue = ObjectValue[];
 export declare type BusinessData = ObjectValue;
 export declare type ComponentOptions = {
-    requiredMark?: ReactNode;
-    showReportOutputButton?: boolean;
+    title?: string;
+    requiredIndicator?: 'simple' | 'filled' | 'outlined';
+    showReportGenerationButton?: boolean;
+    showBackButton?: boolean;
 };
 export declare type CustomValidationResult = {
+    type: 'custom';
+    property: string;
     error: boolean;
     message?: string;
 };

package/dist/webform/ReportWebForm.d.ts

@@ -7,14 +7,15 @@ declare type Props = {
     width?: string | number;
     height?: string | number;
     customStyles?: ThemeOptions;
-    title?: string;
     layoutId: number;
     values?: BusinessData;
     fileName?: string;
     options?: ComponentOptions;
     validate?: (property: string, rowIndex: number | undefined, value: ItemValue, values: BusinessData) => Promise<CustomValidationResult>;
+    validateAll?: (values: BusinessData) => Promise<CustomValidationResult[]>;
     onChange?: (property: string, rowIndex: number | undefined, value: ItemValue, values: BusinessData) => void;
     onGenerate?: (logId: string) => void;
+    onBack?: () => void;
 };
 export declare const ReportWebForm: VFC<Props>;
 export {};

package/dist/webform/ReportWebForm.js

@@ -57,7 +57,7 @@ var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = require("react");
 var targetOrigin_1 = require("../util/targetOrigin");
 var ReportWebForm = function (_a) {
-    var session = _a.session, _b = _a.width, width = _b === void 0 ? '100%' : _b, _c = _a.height, height = _c === void 0 ? '100%' : _c, customStyles = _a.customStyles, title = _a.title, layoutId = _a.layoutId, values = _a.values, fileName = _a.fileName, options = _a.options, validate = _a.validate, onChange = _a.onChange, onGenerate = _a.onGenerate;
+    var session = _a.session, _b = _a.width, width = _b === void 0 ? '100%' : _b, _c = _a.height, height = _c === void 0 ? '100%' : _c, customStyles = _a.customStyles, layoutId = _a.layoutId, values = _a.values, fileName = _a.fileName, options = _a.options, validate = _a.validate, validateAll = _a.validateAll, onChange = _a.onChange, onGenerate = _a.onGenerate, onBack = _a.onBack;
     var _d = __read((0, react_1.useState)(false), 2), initialized = _d[0], setInitialized = _d[1];
     var prevInitialized = (0, react_1.useRef)(false);
     var iframe = (0, react_1.useRef)(null);
@@ -87,7 +87,7 @@ var ReportWebForm = function (_a) {
         prevInitialized.current = initialized;
     }, [initialized, values, sendMessage]);
     var handleMessage = (0, react_1.useCallback)(function (e) { return __awaiter(void 0, void 0, void 0, function () {
-        var message, from, action, _a, property, rowIndex, value, values_1, result, _b, property, rowIndex, value, values_2, logId;
+        var message, from, action, _a, property, rowIndex, value, values_1, result, values_2, results, _b, property, rowIndex, value, values_3, logId;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -103,7 +103,6 @@ var ReportWebForm = function (_a) {
                     if (!(action === 'onAuthorized')) return [3 /*break*/, 1];
                     sendMessage('onShow', {
                         customStyles: customStyles,
-                        title: title,
                         layoutId: layoutId,
                         values: values,
                         fileName: fileName,
@@ -111,7 +110,7 @@ var ReportWebForm = function (_a) {
                     });
                     // 初期化完了状態にする
                     setInitialized(true);
-                    return [3 /*break*/, 4];
+                    return [3 /*break*/, 6];
                 case 1:
                     if (!(action === 'onValidate')) return [3 /*break*/, 3];
                     if (!validate) {
@@ -125,14 +124,28 @@ var ReportWebForm = function (_a) {
                     result = _c.sent();
                     // バリデーション結果を送信
                     sendMessage('onValidated', result, message.messageId);
-                    return [3 /*break*/, 4];
+                    return [3 /*break*/, 6];
                 case 3:
+                    if (!(action === 'onValidateAll')) return [3 /*break*/, 5];
+                    if (!validateAll) {
+                        return [2 /*return*/];
+                    }
+                    values_2 = message.payload.values;
+                    return [4 /*yield*/, validateAll(values_2)
+                        // バリデーション結果を送信
+                    ];
+                case 4:
+                    results = _c.sent();
+                    // バリデーション結果を送信
+                    sendMessage('onValidatedAll', results, message.messageId);
+                    return [3 /*break*/, 6];
+                case 5:
                     if (action === 'onChange') {
                         if (!onChange) {
                             return [2 /*return*/];
                         }
-                        _b = message.payload, property = _b.property, rowIndex = _b.rowIndex, value = _b.value, values_2 = _b.values;
-                        onChange(property, rowIndex, value, values_2);
+                        _b = message.payload, property = _b.property, rowIndex = _b.rowIndex, value = _b.value, values_3 = _b.values;
+                        onChange(property, rowIndex, value, values_3);
                     }
                     else if (action === 'onGenerate') {
                         if (!onGenerate) {
@@ -141,21 +154,28 @@ var ReportWebForm = function (_a) {
                         logId = message.payload;
                         onGenerate(logId);
                     }
-                    _c.label = 4;
-                case 4: return [2 /*return*/];
+                    else if (action === 'onBack') {
+                        if (!onBack) {
+                            return [2 /*return*/];
+                        }
+                        onBack();
+                    }
+                    _c.label = 6;
+                case 6: return [2 /*return*/];
             }
         });
     }); }, [
         customStyles,
         fileName,
         layoutId,
+        onBack,
         onChange,
         onGenerate,
         options,
         sendMessage,
         session === null || session === void 0 ? void 0 : session.newUrl,
-        title,
         validate,
+        validateAll,
         values,
     ]);
     (0, react_1.useEffect)(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sutech_jp/raas-react-client",
-  "version": "0.1.31",
+  "version": "0.1.33",
   "description": "react client for raas produced by SuTech",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",