@nocobase/plugin-ui-schema-storage 0.9.1-alpha.2 → 0.9.2-alpha.1

package/lib/actions/ui-schema-action.js

@@ -4,40 +4,30 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.uiSchemaActions = void 0;
-
 function _lodash() {
   const data = _interopRequireDefault(require("lodash"));
-
   _lodash = function _lodash() {
     return data;
   };
-
   return data;
 }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
 const getRepositoryFromCtx = ctx => {
   const repo = ctx.db.getCollection('uiSchemas').repository;
   repo.setCache(ctx.cache);
   return repo;
 };
-
 const callRepositoryMethod = (method, paramsKey, optionsBuilder) => {
   return /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(function* (ctx, next) {
       const params = _lodash().default.get(ctx.action.params, paramsKey);
-
       const options = optionsBuilder ? optionsBuilder(ctx.action.params) : {};
       const repository = getRepositoryFromCtx(ctx);
       const returnValue = yield repository[method](params, options);
@@ -46,24 +36,20 @@ const callRepositoryMethod = (method, paramsKey, optionsBuilder) => {
       };
       yield next();
     });
-
     return function (_x, _x2) {
       return _ref.apply(this, arguments);
     };
   }();
 };
-
 function parseInsertAdjacentValues(values) {
   if (_lodash().default.has(values, 'schema')) {
     return values;
   }
-
   return {
     schema: values,
     wrap: null
   };
 }
-
 const uiSchemaActions = {
   getJsonSchema: callRepositoryMethod('getJsonSchema', 'resourceIndex', params => {
     const includeAsyncNode = params === null || params === void 0 ? void 0 : params.includeAsyncNode;
@@ -81,21 +67,18 @@ const uiSchemaActions = {
   patch: callRepositoryMethod('patch', 'values'),
   batchPatch: callRepositoryMethod('batchPatch', 'values'),
   clearAncestor: callRepositoryMethod('clearAncestor', 'resourceIndex'),
-
   insertAdjacent(ctx, next) {
     return _asyncToGenerator(function* () {
       const _ctx$action$params = ctx.action.params,
-            resourceIndex = _ctx$action$params.resourceIndex,
-            position = _ctx$action$params.position,
-            values = _ctx$action$params.values,
-            removeParentsIfNoChildren = _ctx$action$params.removeParentsIfNoChildren,
-            breakRemoveOn = _ctx$action$params.breakRemoveOn;
+        resourceIndex = _ctx$action$params.resourceIndex,
+        position = _ctx$action$params.position,
+        values = _ctx$action$params.values,
+        removeParentsIfNoChildren = _ctx$action$params.removeParentsIfNoChildren,
+        breakRemoveOn = _ctx$action$params.breakRemoveOn;
       const repository = getRepositoryFromCtx(ctx);
-
       const _parseInsertAdjacentV = parseInsertAdjacentValues(values),
-            schema = _parseInsertAdjacentV.schema,
-            wrap = _parseInsertAdjacentV.wrap;
-
+        schema = _parseInsertAdjacentV.schema,
+        wrap = _parseInsertAdjacentV.wrap;
       ctx.body = yield repository.insertAdjacent(position, resourceIndex, schema, {
         removeParentsIfNoChildren,
         breakRemoveOn,
@@ -104,20 +87,17 @@ const uiSchemaActions = {
       yield next();
     })();
   },
-
   insertBeforeBegin: insertPositionActionBuilder('beforeBegin'),
   insertAfterBegin: insertPositionActionBuilder('afterBegin'),
   insertBeforeEnd: insertPositionActionBuilder('beforeEnd'),
   insertAfterEnd: insertPositionActionBuilder('afterEnd'),
-
   saveAsTemplate(ctx, next) {
     return _asyncToGenerator(function* () {
       const _ctx$action$params2 = ctx.action.params,
-            filterByTk = _ctx$action$params2.filterByTk,
-            values = _ctx$action$params2.values;
+        filterByTk = _ctx$action$params2.filterByTk,
+        values = _ctx$action$params2.values;
       const db = ctx.db;
       const transaction = yield db.sequelize.transaction();
-
       try {
         yield db.getRepository('uiSchemaTemplates').create({
           values: _objectSpread(_objectSpread({}, values), {}, {
@@ -136,28 +116,23 @@ const uiSchemaActions = {
         yield transaction.rollback();
         throw error;
       }
-
       yield next();
     })();
   }
-
 };
 exports.uiSchemaActions = uiSchemaActions;
-
 function insertPositionActionBuilder(position) {
   return /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(function* (ctx, next) {
       const _ctx$action$params3 = ctx.action.params,
-            resourceIndex = _ctx$action$params3.resourceIndex,
-            values = _ctx$action$params3.values,
-            removeParentsIfNoChildren = _ctx$action$params3.removeParentsIfNoChildren,
-            breakRemoveOn = _ctx$action$params3.breakRemoveOn;
+        resourceIndex = _ctx$action$params3.resourceIndex,
+        values = _ctx$action$params3.values,
+        removeParentsIfNoChildren = _ctx$action$params3.removeParentsIfNoChildren,
+        breakRemoveOn = _ctx$action$params3.breakRemoveOn;
       const repository = getRepositoryFromCtx(ctx);
-
       const _parseInsertAdjacentV2 = parseInsertAdjacentValues(values),
-            schema = _parseInsertAdjacentV2.schema,
-            wrap = _parseInsertAdjacentV2.wrap;
-
+        schema = _parseInsertAdjacentV2.schema,
+        wrap = _parseInsertAdjacentV2.wrap;
       ctx.body = yield repository.insertAdjacent(position, resourceIndex, schema, {
         removeParentsIfNoChildren,
         breakRemoveOn,
@@ -165,7 +140,6 @@ function insertPositionActionBuilder(position) {
       });
       yield next();
     });
-
     return function (_x3, _x4) {
       return _ref2.apply(this, arguments);
     };

package/lib/collections/uiSchemaServerHooks.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _default = {
-  namespace: 'ui-schema-storage',
+  namespace: 'ui-schema-storage.uiSchemas',
   duplicator: 'required',
   name: 'uiSchemaServerHooks',
   model: 'ServerHookModel',

package/lib/collections/uiSchemaTemplates.js

@@ -4,19 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _database() {
   const data = require("@nocobase/database");
-
   _database = function _database() {
     return data;
   };
-
   return data;
 }
-
 var _default = (0, _database().defineCollection)({
-  namespace: 'ui-schema-storage',
+  namespace: 'ui-schema-storage.uiSchemas',
   duplicator: 'required',
   name: 'uiSchemaTemplates',
   autoGenId: false,
@@ -50,5 +46,4 @@ var _default = (0, _database().defineCollection)({
     onDelete: 'CASCADE'
   }]
 });
-
 exports.default = _default;

package/lib/collections/uiSchemaTreePath.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _default = {
-  namespace: 'ui-schema-storage',
+  namespace: 'ui-schema-storage.uiSchemas',
   duplicator: 'required',
   name: 'uiSchemaTreePath',
   autoGenId: false,

package/lib/collections/uiSchemas.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _default = {
-  namespace: 'ui-schema-storage',
+  namespace: 'ui-schema-storage.uiSchemas',
   duplicator: 'required',
   name: 'uiSchemas',
   title: '字段配置',

package/lib/dao/ui_schema_dao.js

@@ -4,12 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.UiSchemaDAO = void 0;
-
 class UiSchemaDAO {
   constructor(schema) {
     this.nodeKeys = ['properties', 'patternProperties', 'additionalProperties'];
   }
-
 }
-
 exports.UiSchemaDAO = UiSchemaDAO;

package/lib/dao/ui_schema_node_dao.js

@@ -4,13 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.UiSchemaNodeDAO = void 0;
-
 class UiSchemaNodeDAO {
   constructor(schemaNode) {
     this.schemaNode = void 0;
     this.schemaNode = schemaNode;
   }
-
 }
-
 exports.UiSchemaNodeDAO = UiSchemaNodeDAO;

package/lib/index.js

@@ -10,9 +10,7 @@ Object.defineProperty(exports, "default", {
     return _server.default;
   }
 });
-
 var _repository = require("./repository");
-
 Object.keys(_repository).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -24,9 +22,7 @@ Object.keys(_repository).forEach(function (key) {
     }
   });
 });
-
 var _server = _interopRequireWildcard(require("./server"));
-
 Object.keys(_server).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -38,7 +34,5 @@ Object.keys(_server).forEach(function (key) {
     }
   });
 });
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

package/lib/migrations/20230330214649-filter-form-block.d.ts

@@ -0,0 +1,4 @@
+import { Migration } from '@nocobase/server';
+export default class extends Migration {
+    up(): Promise<void>;
+}

package/lib/migrations/20230330214649-filter-form-block.js

@@ -0,0 +1,62 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+function _server() {
+  const data = require("@nocobase/server");
+  _server = function _server() {
+    return data;
+  };
+  return data;
+}
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+class _default extends _server().Migration {
+  up() {
+    var _this = this;
+    return _asyncToGenerator(function* () {
+      const result = yield _this.app.version.satisfies('<0.9.1-alpha.3');
+      if (!result) {
+        return;
+      }
+      const r = _this.db.getRepository('uiSchemas');
+      const items = yield r.find({
+        filter: {
+          'schema.x-designer': 'FormV2.FilterDesigner'
+        }
+      });
+      yield _this.db.sequelize.transaction( /*#__PURE__*/function () {
+        var _ref = _asyncToGenerator(function* (transaction) {
+          var _iterator = _createForOfIteratorHelper(items),
+            _step;
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              const item = _step.value;
+              const schema = item.schema;
+              const decorator = schema['x-decorator'];
+              schema['x-decorator'] = 'FilterFormBlockProvider';
+              item.set('schema', schema);
+              console.log(item['x-uid'], decorator, schema['x-decorator']);
+              yield item.save({
+                transaction
+              });
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+        });
+        return function (_x) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+    })();
+  }
+}
+exports.default = _default;

package/lib/model.js

@@ -4,23 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.UiSchemaModel = void 0;
-
 function _database() {
   const data = require("@nocobase/database");
-
   _database = function _database() {
     return data;
   };
-
   return data;
 }
-
 class UiSchemaModel extends _database().MagicAttributeModel {
   getServerHooksByType(type) {
     const hooks = this.get('x-server-hooks') || [];
     return hooks.filter(hook => hook.type === type);
   }
-
 }
-
 exports.UiSchemaModel = UiSchemaModel;