@dckj-npm/lowcode-plugin-code-generator 1.2.7 → 1.2.9

package/es/components/CodeGenActionBtn/CodeGenActionBtn.js

@@ -6,8 +6,8 @@ import React, { useState } from 'react';
 import * as CodeGenerator from '@dckj-npm/lowcode-code-generator/standalone-loader';
 import { Button, Drawer, Loading, Message } from '@alifd/next';
 import coerce from 'semver/functions/coerce';
-import { project } from '@alilc/lowcode-engine';
 import { CodeGenResult } from '../CodeGenResult';
+import { getAllSchemaByResourceList, getProjectId, getResourceListFromLocalStorage } from "../../utils/utils";
 export function CodeGenActionBtn(_ref) {
   var ctx = _ref.ctx;
   var _useState = useState({
@@ -23,7 +23,7 @@ export function CodeGenActionBtn(_ref) {
     setState = _useState[1];
   var handleClick = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var originalSchema, schema, result;
+      var name, resourceList, allSchema, resultSchema, result;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -38,38 +38,48 @@ export function CodeGenActionBtn(_ref) {
             });
 
             // 获取 schema，并修正
-            _context.next = 4;
-            return project.exportSchema();
-          case 4:
-            originalSchema = _context.sent;
-            console.log('ctx ', ctx);
+            // const originalSchema = await project.exportSchema();
+            name = getProjectId();
+            _context.next = 5;
+            return getResourceListFromLocalStorage(name);
+          case 5:
+            resourceList = _context.sent;
+            console.log('resourceList', resourceList);
+            _context.next = 9;
+            return getAllSchemaByResourceList(name, resourceList);
+          case 9:
+            allSchema = _context.sent;
+            _context.next = 12;
+            return Promise.all(allSchema.map(function (item) {
+              return fixSchema(item);
+            }));
+          case 12:
+            resultSchema = _context.sent;
+            console.log('allSchema', allSchema);
+            console.log('resultSchema', resultSchema);
+            // console.log('ctx ', ctx)
             // console.log('isActive ', ctx.workspace.isActive)
             // console.log('window.exportSchema ', ctx.workspace.window.exportSchema())
             // console.log('skeleton ', ctx.workspace.skeleton)
             // console.log('windows ', ctx.workspace.windows)
             // const originalSchema2 = await ctx.project.exportSchema();
-            _context.next = 8;
-            return fixSchema(originalSchema);
-          case 8:
-            schema = _context.sent;
-            console.log('got schema:222222 ', schema);
+            // const schema = await fixSchema(originalSchema);
+            // console.log('got schema:222222 ', schema);
             // console.log('got schema:33333333 ', originalSchema2);
 
             setState(function (prev) {
-              return _extends({}, prev, {
-                schema: schema,
-                originalSchema: originalSchema
-              });
+              return _extends({}, prev);
             });
 
             // 出码...
-            _context.next = 13;
+            _context.next = 18;
             return CodeGenerator.generateCode({
               solution: 'vuejs3',
-              schema: schema,
-              flattenResult: true
+              schema: resultSchema,
+              flattenResult: true,
+              resourceList: resourceList
             });
-          case 13:
+          case 18:
             result = _context.sent;
             console.log('generated: ', result);
             setState(function (prev) {
@@ -78,10 +88,10 @@ export function CodeGenActionBtn(_ref) {
                 result: result
               });
             });
-            _context.next = 22;
+            _context.next = 27;
             break;
-          case 18:
-            _context.prev = 18;
+          case 23:
+            _context.prev = 23;
             _context.t0 = _context["catch"](0);
             console.error('failed to run code generator: ', _context.t0);
             setState(function (prev) {
@@ -90,11 +100,11 @@ export function CodeGenActionBtn(_ref) {
                 error: _context.t0 instanceof Error ? _context.t0 : new Error("" + ((_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message) || _context.t0))
               });
             });
-          case 22:
+          case 27:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 18]]);
+      }, _callee, null, [[0, 23]]);
     }));
     return function handleClick() {
       return _ref2.apply(this, arguments);

package/es/types/SyncCodeGenResult.d.ts

@@ -5,3 +5,12 @@ export declare type SyncCodeGenResult = {
         content: string;
     }>;
 };
+/**
+ * 页面参数
+ */
+export interface ResourceListType {
+    title: string;
+    slug: string;
+    id: string;
+    firstPage: 'true' | 'false';
+}

package/es/utils/utils.d.ts

@@ -0,0 +1,26 @@
+import { ResourceListType } from "../types";
+import { IPublicTypeProjectSchema } from "@alilc/lowcode-types";
+/**
+ * 从缓存获取ResourceList
+ * @param scenarioName
+ */
+export declare const getResourceListFromLocalStorage: (scenarioName: string) => Promise<ResourceListType[]>;
+/**
+ * 根据ResourceList获取所有schema
+ * @param scenarioName
+ * @param ResourceList
+ */
+export declare const getAllSchemaByResourceList: (scenarioName: string, ResourceList: ResourceListType[]) => Promise<IPublicTypeProjectSchema[]>;
+export declare const getResourceName: (scenarioName: string, ns?: string) => string;
+/**
+ * 获取项目id
+ */
+export declare function getProjectId(): string;
+/**
+ * 获取地址栏参数值
+ * @param queryName
+ * @param defaultValue
+ * @returns {string}
+ */
+export declare function getValueFromQueryByName(queryName: string, defaultValue?: string): string;
+export declare const getLSName: (scenarioName: string, id?: string, ns?: string) => string;

package/es/utils/utils.js

@@ -0,0 +1,99 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+/**
+ * 从缓存获取ResourceList
+ * @param scenarioName
+ */
+export var getResourceListFromLocalStorage = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(scenarioName) {
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (scenarioName) {
+            _context.next = 3;
+            break;
+          }
+          console.error('scenarioName is required!');
+          return _context.abrupt("return");
+        case 3:
+          return _context.abrupt("return", JSON.parse(window.localStorage.getItem(getResourceName(scenarioName)) || '[{"title":"首页","slug":"index","id": "index"}]'));
+        case 4:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function getResourceListFromLocalStorage(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+/**
+ * 根据ResourceList获取所有schema
+ * @param scenarioName
+ * @param ResourceList
+ */
+export var getAllSchemaByResourceList = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(scenarioName, ResourceList) {
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          if (ResourceList) {
+            _context2.next = 3;
+            break;
+          }
+          console.error('ResourceList is required!');
+          return _context2.abrupt("return");
+        case 3:
+          return _context2.abrupt("return", ResourceList.map(function (item) {
+            console.log('ResourceList.map', item);
+            console.log('getLSName(scenarioName, item.id)', getLSName(scenarioName, item.id));
+            var localSchema = window.localStorage.getItem(getLSName(scenarioName, item.id)) || '{}';
+            console.log('localSchema', localSchema);
+            return JSON.parse(localSchema);
+          }));
+        case 4:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return function getAllSchemaByResourceList(_x2, _x3) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+export var getResourceName = function getResourceName(scenarioName, ns) {
+  if (ns === void 0) {
+    ns = 'resourceList';
+  }
+  return scenarioName + ":" + ns;
+};
+
+/**
+ * 获取项目id
+ */
+export function getProjectId() {
+  return getValueFromQueryByName('projectId', 'general');
+}
+
+/**
+ * 获取地址栏参数值
+ * @param queryName
+ * @param defaultValue
+ * @returns {string}
+ */
+export function getValueFromQueryByName(queryName, defaultValue) {
+  if (defaultValue === void 0) {
+    defaultValue = '';
+  }
+  if (location.search) {
+    return new URLSearchParams(location.search.slice(1)).get(queryName) || defaultValue;
+  }
+  return defaultValue;
+}
+export var getLSName = function getLSName(scenarioName, id, ns) {
+  if (ns === void 0) {
+    ns = 'projectSchema';
+  }
+  return scenarioName + ":" + id + ":" + ns;
+};

package/lib/components/CodeGenActionBtn/CodeGenActionBtn.js

@@ -12,8 +12,8 @@ var _react = _interopRequireWildcard(require("react"));
 var CodeGenerator = _interopRequireWildcard(require("@dckj-npm/lowcode-code-generator/standalone-loader"));
 var _next = require("@alifd/next");
 var _coerce = _interopRequireDefault(require("semver/functions/coerce"));
-var _lowcodeEngine = require("@alilc/lowcode-engine");
 var _CodeGenResult = require("../CodeGenResult");
+var _utils = require("../../utils/utils");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function CodeGenActionBtn(_ref) {
@@ -31,7 +31,7 @@ function CodeGenActionBtn(_ref) {
     setState = _useState[1];
   var handleClick = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var originalSchema, schema, result;
+      var name, resourceList, allSchema, resultSchema, result;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -46,38 +46,48 @@ function CodeGenActionBtn(_ref) {
             });
 
             // 获取 schema，并修正
-            _context.next = 4;
-            return _lowcodeEngine.project.exportSchema();
-          case 4:
-            originalSchema = _context.sent;
-            console.log('ctx ', ctx);
+            // const originalSchema = await project.exportSchema();
+            name = (0, _utils.getProjectId)();
+            _context.next = 5;
+            return (0, _utils.getResourceListFromLocalStorage)(name);
+          case 5:
+            resourceList = _context.sent;
+            console.log('resourceList', resourceList);
+            _context.next = 9;
+            return (0, _utils.getAllSchemaByResourceList)(name, resourceList);
+          case 9:
+            allSchema = _context.sent;
+            _context.next = 12;
+            return Promise.all(allSchema.map(function (item) {
+              return fixSchema(item);
+            }));
+          case 12:
+            resultSchema = _context.sent;
+            console.log('allSchema', allSchema);
+            console.log('resultSchema', resultSchema);
+            // console.log('ctx ', ctx)
             // console.log('isActive ', ctx.workspace.isActive)
             // console.log('window.exportSchema ', ctx.workspace.window.exportSchema())
             // console.log('skeleton ', ctx.workspace.skeleton)
             // console.log('windows ', ctx.workspace.windows)
             // const originalSchema2 = await ctx.project.exportSchema();
-            _context.next = 8;
-            return fixSchema(originalSchema);
-          case 8:
-            schema = _context.sent;
-            console.log('got schema:222222 ', schema);
+            // const schema = await fixSchema(originalSchema);
+            // console.log('got schema:222222 ', schema);
             // console.log('got schema:33333333 ', originalSchema2);
 
             setState(function (prev) {
-              return (0, _extends2["default"])({}, prev, {
-                schema: schema,
-                originalSchema: originalSchema
-              });
+              return (0, _extends2["default"])({}, prev);
             });
 
             // 出码...
-            _context.next = 13;
+            _context.next = 18;
             return CodeGenerator.generateCode({
               solution: 'vuejs3',
-              schema: schema,
-              flattenResult: true
+              schema: resultSchema,
+              flattenResult: true,
+              resourceList: resourceList
             });
-          case 13:
+          case 18:
             result = _context.sent;
             console.log('generated: ', result);
             setState(function (prev) {
@@ -86,10 +96,10 @@ function CodeGenActionBtn(_ref) {
                 result: result
               });
             });
-            _context.next = 22;
+            _context.next = 27;
             break;
-          case 18:
-            _context.prev = 18;
+          case 23:
+            _context.prev = 23;
             _context.t0 = _context["catch"](0);
             console.error('failed to run code generator: ', _context.t0);
             setState(function (prev) {
@@ -98,11 +108,11 @@ function CodeGenActionBtn(_ref) {
                 error: _context.t0 instanceof Error ? _context.t0 : new Error("" + ((_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message) || _context.t0))
               });
             });
-          case 22:
+          case 27:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 18]]);
+      }, _callee, null, [[0, 23]]);
     }));
     return function handleClick() {
       return _ref2.apply(this, arguments);

package/lib/types/SyncCodeGenResult.d.ts

@@ -5,3 +5,12 @@ export declare type SyncCodeGenResult = {
         content: string;
     }>;
 };
+/**
+ * 页面参数
+ */
+export interface ResourceListType {
+    title: string;
+    slug: string;
+    id: string;
+    firstPage: 'true' | 'false';
+}

package/lib/utils/utils.d.ts

@@ -0,0 +1,26 @@
+import { ResourceListType } from "../types";
+import { IPublicTypeProjectSchema } from "@alilc/lowcode-types";
+/**
+ * 从缓存获取ResourceList
+ * @param scenarioName
+ */
+export declare const getResourceListFromLocalStorage: (scenarioName: string) => Promise<ResourceListType[]>;
+/**
+ * 根据ResourceList获取所有schema
+ * @param scenarioName
+ * @param ResourceList
+ */
+export declare const getAllSchemaByResourceList: (scenarioName: string, ResourceList: ResourceListType[]) => Promise<IPublicTypeProjectSchema[]>;
+export declare const getResourceName: (scenarioName: string, ns?: string) => string;
+/**
+ * 获取项目id
+ */
+export declare function getProjectId(): string;
+/**
+ * 获取地址栏参数值
+ * @param queryName
+ * @param defaultValue
+ * @returns {string}
+ */
+export declare function getValueFromQueryByName(queryName: string, defaultValue?: string): string;
+export declare const getLSName: (scenarioName: string, id?: string, ns?: string) => string;

package/lib/utils/utils.js

@@ -0,0 +1,107 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+exports.__esModule = true;
+exports.getLSName = exports.getAllSchemaByResourceList = void 0;
+exports.getProjectId = getProjectId;
+exports.getResourceName = exports.getResourceListFromLocalStorage = void 0;
+exports.getValueFromQueryByName = getValueFromQueryByName;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+/**
+ * 从缓存获取ResourceList
+ * @param scenarioName
+ */
+var getResourceListFromLocalStorage = exports.getResourceListFromLocalStorage = /*#__PURE__*/function () {
+  var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(scenarioName) {
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (scenarioName) {
+            _context.next = 3;
+            break;
+          }
+          console.error('scenarioName is required!');
+          return _context.abrupt("return");
+        case 3:
+          return _context.abrupt("return", JSON.parse(window.localStorage.getItem(getResourceName(scenarioName)) || '[{"title":"首页","slug":"index","id": "index"}]'));
+        case 4:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function getResourceListFromLocalStorage(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+/**
+ * 根据ResourceList获取所有schema
+ * @param scenarioName
+ * @param ResourceList
+ */
+var getAllSchemaByResourceList = exports.getAllSchemaByResourceList = /*#__PURE__*/function () {
+  var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(scenarioName, ResourceList) {
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          if (ResourceList) {
+            _context2.next = 3;
+            break;
+          }
+          console.error('ResourceList is required!');
+          return _context2.abrupt("return");
+        case 3:
+          return _context2.abrupt("return", ResourceList.map(function (item) {
+            console.log('ResourceList.map', item);
+            console.log('getLSName(scenarioName, item.id)', getLSName(scenarioName, item.id));
+            var localSchema = window.localStorage.getItem(getLSName(scenarioName, item.id)) || '{}';
+            console.log('localSchema', localSchema);
+            return JSON.parse(localSchema);
+          }));
+        case 4:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return function getAllSchemaByResourceList(_x2, _x3) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+var getResourceName = exports.getResourceName = function getResourceName(scenarioName, ns) {
+  if (ns === void 0) {
+    ns = 'resourceList';
+  }
+  return scenarioName + ":" + ns;
+};
+
+/**
+ * 获取项目id
+ */
+function getProjectId() {
+  return getValueFromQueryByName('projectId', 'general');
+}
+
+/**
+ * 获取地址栏参数值
+ * @param queryName
+ * @param defaultValue
+ * @returns {string}
+ */
+function getValueFromQueryByName(queryName, defaultValue) {
+  if (defaultValue === void 0) {
+    defaultValue = '';
+  }
+  if (location.search) {
+    return new URLSearchParams(location.search.slice(1)).get(queryName) || defaultValue;
+  }
+  return defaultValue;
+}
+var getLSName = exports.getLSName = function getLSName(scenarioName, id, ns) {
+  if (ns === void 0) {
+    ns = 'projectSchema';
+  }
+  return scenarioName + ":" + id + ":" + ns;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dckj-npm/lowcode-plugin-code-generator",
-  "version": "1.2.7",
+  "version": "1.2.9",
   "description": "集团低代码引擎 - 浏览器出码插件",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -35,7 +35,7 @@
     "@alilc/lowcode-code-generator": "^1.0.4",
     "@alilc/lowcode-plugin-base-monaco-editor": "^1.0.0",
     "@alilc/lowcode-types": "^1.0.0",
-    "@dckj-npm/lowcode-code-generator": "^1.2.12",
+    "@dckj-npm/lowcode-code-generator": "^1.2.13",
     "@types/file-saver": "^2.0.4",
     "@types/js-base64": "^3.3.1",
     "@types/string-natural-compare": "^3.0.2",