@sutech_jp/raas-react-client 0.1.29 → 0.1.31

package/dist/index.d.ts

@@ -5,4 +5,5 @@ export { useReportPaperForm, createLocalSession } from './form/useReportPaperFor
 export { ReportLayoutGallery } from './gallery/ReportLayoutGallery';
 export { ReportTenantInfo } from './tenantInfo/ReportTenantInfo';
 export { ReportOrganizer } from './organizer/ReportOrganizer';
+export { ReportWebForm } from './webform/ReportWebForm';
 export * from './types';

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReportOrganizer = exports.ReportTenantInfo = exports.ReportLayoutGallery = exports.createLocalSession = exports.useReportPaperForm = exports.ReportPaperForm = exports.ReportDesigner = exports.ReportConfig = void 0;
+exports.ReportWebForm = exports.ReportOrganizer = exports.ReportTenantInfo = exports.ReportLayoutGallery = exports.createLocalSession = exports.useReportPaperForm = exports.ReportPaperForm = exports.ReportDesigner = exports.ReportConfig = void 0;
 var ReportConfig_1 = require("./config/ReportConfig");
 Object.defineProperty(exports, "ReportConfig", { enumerable: true, get: function () { return ReportConfig_1.ReportConfig; } });
 var ReportDesigner_1 = require("./designer/ReportDesigner");
@@ -30,4 +30,6 @@ var ReportTenantInfo_1 = require("./tenantInfo/ReportTenantInfo");
 Object.defineProperty(exports, "ReportTenantInfo", { enumerable: true, get: function () { return ReportTenantInfo_1.ReportTenantInfo; } });
 var ReportOrganizer_1 = require("./organizer/ReportOrganizer");
 Object.defineProperty(exports, "ReportOrganizer", { enumerable: true, get: function () { return ReportOrganizer_1.ReportOrganizer; } });
+var ReportWebForm_1 = require("./webform/ReportWebForm");
+Object.defineProperty(exports, "ReportWebForm", { enumerable: true, get: function () { return ReportWebForm_1.ReportWebForm; } });
 __exportStar(require("./types"), exports);

package/dist/webform/ReportWebForm.d.ts

@@ -12,7 +12,7 @@ declare type Props = {
     values?: BusinessData;
     fileName?: string;
     options?: ComponentOptions;
-    validateCustom?: (property: string, rowIndex: number | undefined, value: ItemValue, values: BusinessData) => CustomValidationResult;
+    validate?: (property: string, rowIndex: number | undefined, value: ItemValue, values: BusinessData) => Promise<CustomValidationResult>;
     onChange?: (property: string, rowIndex: number | undefined, value: ItemValue, values: BusinessData) => void;
     onGenerate?: (logId: string) => void;
 };

package/dist/webform/ReportWebForm.js

@@ -1,13 +1,67 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReportWebForm = void 0;
 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, validateCustom = _a.validateCustom, 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, 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 _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);
-    var sendMessage = (0, react_1.useCallback)(function (action, props) {
+    var sendMessage = (0, react_1.useCallback)(function (action, props, requestId) {
         var _a;
         var iframeWindow = (_a = iframe.current) === null || _a === void 0 ? void 0 : _a.contentWindow;
         if (!iframeWindow)
@@ -16,45 +70,82 @@ var ReportWebForm = function (_a) {
             from: 'webformClient',
             action: action,
             props: props,
+            messageId: requestId,
         }, (0, targetOrigin_1.getTargetOrigin)(session === null || session === void 0 ? void 0 : session.newUrl));
     }, [session === null || session === void 0 ? void 0 : session.newUrl]);
-    var handleMessage = (0, react_1.useCallback)(function (e) {
-        if ((0, targetOrigin_1.getTargetOrigin)(session === null || session === void 0 ? void 0 : session.newUrl) !== '*' && e.origin !== (0, targetOrigin_1.getTargetOrigin)(session === null || session === void 0 ? void 0 : session.newUrl)) {
-            return;
-        }
-        var message = e.data;
-        var from = message === null || message === void 0 ? void 0 : message.from;
-        var action = message === null || message === void 0 ? void 0 : message.action;
-        if (from !== 'webform') {
-            return;
-        }
-        if (action === 'onAuthorized') {
-            sendMessage('onShow', {
-                customStyles: customStyles,
-                title: title,
-                layoutId: layoutId,
-                values: values,
-                fileName: fileName,
-                options: options,
-            });
+    (0, react_1.useEffect)(function () {
+        // 前回の initialized の値を取得
+        var wasInitialized = prevInitialized.current;
+        // initialized が true になった直後は、データ更新メッセージを送信する必要がないため
+        // initialized に加えて、前回の initialized（wasInitialized） を確認し、
+        // 両方が true の場合のみデータ更新メッセージを送信する
+        if (initialized && wasInitialized) {
+            // データの更新があった場合は、データを送信する
+            sendMessage('onUpdateData', values);
         }
-        else if (action === 'validateCustom') {
-            if (!validateCustom) {
-                return;
+        // 現在の initialized の値を保存
+        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;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    if ((0, targetOrigin_1.getTargetOrigin)(session === null || session === void 0 ? void 0 : session.newUrl) !== '*' && e.origin !== (0, targetOrigin_1.getTargetOrigin)(session === null || session === void 0 ? void 0 : session.newUrl)) {
+                        return [2 /*return*/];
+                    }
+                    message = e.data;
+                    from = message === null || message === void 0 ? void 0 : message.from;
+                    action = message === null || message === void 0 ? void 0 : message.action;
+                    if (from !== 'webform') {
+                        return [2 /*return*/];
+                    }
+                    if (!(action === 'onAuthorized')) return [3 /*break*/, 1];
+                    sendMessage('onShow', {
+                        customStyles: customStyles,
+                        title: title,
+                        layoutId: layoutId,
+                        values: values,
+                        fileName: fileName,
+                        options: options,
+                    });
+                    // 初期化完了状態にする
+                    setInitialized(true);
+                    return [3 /*break*/, 4];
+                case 1:
+                    if (!(action === 'onValidate')) return [3 /*break*/, 3];
+                    if (!validate) {
+                        return [2 /*return*/];
+                    }
+                    _a = message.payload, property = _a.property, rowIndex = _a.rowIndex, value = _a.value, values_1 = _a.values;
+                    return [4 /*yield*/, validate(property, rowIndex, value, values_1)
+                        // バリデーション結果を送信
+                    ];
+                case 2:
+                    result = _c.sent();
+                    // バリデーション結果を送信
+                    sendMessage('onValidated', result, message.messageId);
+                    return [3 /*break*/, 4];
+                case 3:
+                    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);
+                    }
+                    else if (action === 'onGenerate') {
+                        if (!onGenerate) {
+                            return [2 /*return*/];
+                        }
+                        logId = message.payload;
+                        onGenerate(logId);
+                    }
+                    _c.label = 4;
+                case 4: return [2 /*return*/];
             }
-            var _a = message.payload, property = _a.property, rowIndex = _a.rowIndex, value = _a.value, values_1 = _a.values;
-            var result = validateCustom(property, rowIndex, value, values_1);
-            sendMessage('onValidated', result);
-        }
-        else if (action === 'onChange') {
-            var _b = message.payload, property = _b.property, rowIndex = _b.rowIndex, value = _b.value, values_2 = _b.values;
-            onChange === null || onChange === void 0 ? void 0 : onChange(property, rowIndex, value, values_2);
-        }
-        else if (action === 'onGenerate') {
-            var logId = message.payload;
-            onGenerate === null || onGenerate === void 0 ? void 0 : onGenerate(logId);
-        }
-    }, [
+        });
+    }); }, [
         customStyles,
         fileName,
         layoutId,
@@ -64,7 +155,7 @@ var ReportWebForm = function (_a) {
         sendMessage,
         session === null || session === void 0 ? void 0 : session.newUrl,
         title,
-        validateCustom,
+        validate,
         values,
     ]);
     (0, react_1.useEffect)(function () {

package/package.json

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