@cniot/mdd-editor 0.2.0-beta.8 → 0.2.0-beta.9

package/build/index.es.js

@@ -1558,132 +1558,103 @@ class HeaderToolbar$1 extends JSONWatch {
     return this.data || [];
   }
 }
-var js_cookie = { exports: {} };
-/*!
- * JavaScript Cookie v2.2.1
- * https://github.com/js-cookie/js-cookie
- *
- * Copyright 2006, 2015 Klaus Hartl & Fagner Brack
- * Released under the MIT license
- */
-(function(module, exports) {
-  (function(factory) {
-    var registeredInModuleLoader;
-    {
-      module.exports = factory();
-      registeredInModuleLoader = true;
-    }
-    if (!registeredInModuleLoader) {
-      var OldCookies = window.Cookies;
-      var api = window.Cookies = factory();
-      api.noConflict = function() {
-        window.Cookies = OldCookies;
-        return api;
-      };
+/*! js-cookie v3.0.5 | MIT */
+function assign(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments[i];
+    for (var key in source) {
+      target[key] = source[key];
     }
-  })(function() {
-    function extend() {
-      var i = 0;
-      var result = {};
-      for (; i < arguments.length; i++) {
-        var attributes = arguments[i];
-        for (var key in attributes) {
-          result[key] = attributes[key];
-        }
-      }
-      return result;
+  }
+  return target;
+}
+var defaultConverter = {
+  read: function(value) {
+    if (value[0] === '"') {
+      value = value.slice(1, -1);
+    }
+    return value.replace(/(%[\dA-F]{2})+/gi, decodeURIComponent);
+  },
+  write: function(value) {
+    return encodeURIComponent(value).replace(
+      /%(2[346BF]|3[AC-F]|40|5[BDE]|60|7[BCD])/g,
+      decodeURIComponent
+    );
+  }
+};
+function init$1(converter, defaultAttributes) {
+  function set(name, value, attributes) {
+    if (typeof document === "undefined") {
+      return;
+    }
+    attributes = assign({}, defaultAttributes, attributes);
+    if (typeof attributes.expires === "number") {
+      attributes.expires = new Date(Date.now() + attributes.expires * 864e5);
     }
-    function decode(s) {
-      return s.replace(/(%[0-9A-Z]{2})+/g, decodeURIComponent);
+    if (attributes.expires) {
+      attributes.expires = attributes.expires.toUTCString();
     }
-    function init2(converter) {
-      function api() {
+    name = encodeURIComponent(name).replace(/%(2[346B]|5E|60|7C)/g, decodeURIComponent).replace(/[()]/g, escape);
+    var stringifiedAttributes = "";
+    for (var attributeName in attributes) {
+      if (!attributes[attributeName]) {
+        continue;
       }
-      function set(key, value, attributes) {
-        if (typeof document === "undefined") {
-          return;
-        }
-        attributes = extend({
-          path: "/"
-        }, api.defaults, attributes);
-        if (typeof attributes.expires === "number") {
-          attributes.expires = new Date(new Date() * 1 + attributes.expires * 864e5);
-        }
-        attributes.expires = attributes.expires ? attributes.expires.toUTCString() : "";
-        try {
-          var result = JSON.stringify(value);
-          if (/^[\{\[]/.test(result)) {
-            value = result;
-          }
-        } catch (e) {
-        }
-        value = converter.write ? converter.write(value, key) : encodeURIComponent(String(value)).replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g, decodeURIComponent);
-        key = encodeURIComponent(String(key)).replace(/%(23|24|26|2B|5E|60|7C)/g, decodeURIComponent).replace(/[\(\)]/g, escape);
-        var stringifiedAttributes = "";
-        for (var attributeName in attributes) {
-          if (!attributes[attributeName]) {
-            continue;
-          }
-          stringifiedAttributes += "; " + attributeName;
-          if (attributes[attributeName] === true) {
-            continue;
-          }
-          stringifiedAttributes += "=" + attributes[attributeName].split(";")[0];
-        }
-        return document.cookie = key + "=" + value + stringifiedAttributes;
+      stringifiedAttributes += "; " + attributeName;
+      if (attributes[attributeName] === true) {
+        continue;
       }
-      function get2(key, json) {
-        if (typeof document === "undefined") {
-          return;
-        }
-        var jar = {};
-        var cookies = document.cookie ? document.cookie.split("; ") : [];
-        var i = 0;
-        for (; i < cookies.length; i++) {
-          var parts = cookies[i].split("=");
-          var cookie = parts.slice(1).join("=");
-          if (!json && cookie.charAt(0) === '"') {
-            cookie = cookie.slice(1, -1);
-          }
-          try {
-            var name = decode(parts[0]);
-            cookie = (converter.read || converter)(cookie, name) || decode(cookie);
-            if (json) {
-              try {
-                cookie = JSON.parse(cookie);
-              } catch (e) {
-              }
-            }
-            jar[name] = cookie;
-            if (key === name) {
-              break;
-            }
-          } catch (e) {
-          }
+      stringifiedAttributes += "=" + attributes[attributeName].split(";")[0];
+    }
+    return document.cookie = name + "=" + converter.write(value, name) + stringifiedAttributes;
+  }
+  function get2(name) {
+    if (typeof document === "undefined" || arguments.length && !name) {
+      return;
+    }
+    var cookies = document.cookie ? document.cookie.split("; ") : [];
+    var jar = {};
+    for (var i = 0; i < cookies.length; i++) {
+      var parts = cookies[i].split("=");
+      var value = parts.slice(1).join("=");
+      try {
+        var found = decodeURIComponent(parts[0]);
+        jar[found] = converter.read(value, found);
+        if (name === found) {
+          break;
         }
-        return key ? jar[key] : jar;
+      } catch (e) {
       }
-      api.set = set;
-      api.get = function(key) {
-        return get2(key, false);
-      };
-      api.getJSON = function(key) {
-        return get2(key, true);
-      };
-      api.remove = function(key, attributes) {
-        set(key, "", extend(attributes, {
-          expires: -1
-        }));
-      };
-      api.defaults = {};
-      api.withConverter = init2;
-      return api;
     }
-    return init2(function() {
-    });
-  });
-})(js_cookie);
-var Cookies = js_cookie.exports;
+    return name ? jar[name] : jar;
+  }
+  return Object.create(
+    {
+      set,
+      get: get2,
+      remove: function(name, attributes) {
+        set(
+          name,
+          "",
+          assign({}, attributes, {
+            expires: -1
+          })
+        );
+      },
+      withAttributes: function(attributes) {
+        return init$1(this.converter, assign({}, this.attributes, attributes));
+      },
+      withConverter: function(converter2) {
+        return init$1(assign({}, this.converter, converter2), this.attributes);
+      }
+    },
+    {
+      attributes: { value: Object.freeze(defaultAttributes) },
+      converter: { value: Object.freeze(converter) }
+    }
+  );
+}
+var api = init$1(defaultConverter, { path: "/" });
 const calcWordWidth = (str) => {
   const Min_Width = 50;
   if (!str || typeof str !== "string")
@@ -1703,7 +1674,7 @@ const upperFirst$1 = (str) => {
   return str.slice(0, 1).toUpperCase() + temp;
 };
 const getGlobalSizeFromCookie = () => {
-  return Cookies == null ? void 0 : Cookies.get("CNUICOOKIESIZE");
+  return api == null ? void 0 : api.get("CNUICOOKIESIZE");
 };
 const getDefaultFomrLabelAlign = () => {
   const globalSize = getGlobalSizeFromCookie();
@@ -2000,29 +1971,29 @@ const openApi3Support = (apiInfo) => {
     responses: res
   };
 };
-var buildSwaggerApiJson = (api, apiMeta) => {
-  if (!api || !apiMeta) {
+var buildSwaggerApiJson = (api2, apiMeta) => {
+  if (!api2 || !apiMeta) {
     throw Error("mdd-tool columns complier error: api or api meta is null");
   }
   const { paths, definitions } = apiMeta || {};
-  if (!paths[api]) {
-    throw Error(`mdd-tool columns complier error: api meta has not api: ${api}`);
+  if (!paths[api2]) {
+    throw Error(`mdd-tool columns complier error: api meta has not api: ${api2}`);
   }
   let method = "";
   let apiInfo = null;
-  if (Object.prototype.hasOwnProperty.call(paths[api], "post")) {
+  if (Object.prototype.hasOwnProperty.call(paths[api2], "post")) {
     method = "post";
-    apiInfo = paths[api]["post"];
-  } else if (Object.prototype.hasOwnProperty.call(paths[api], "get")) {
+    apiInfo = paths[api2]["post"];
+  } else if (Object.prototype.hasOwnProperty.call(paths[api2], "get")) {
     method = "get";
-    apiInfo = paths[api]["get"];
+    apiInfo = paths[api2]["get"];
   } else {
     throw Error("mdd-tool columns complier error: api method not support");
   }
   const { summary } = apiInfo;
   const { parameters = [], responses } = openApi3Support(apiInfo);
   return {
-    api,
+    api: api2,
     method,
     summary,
     parameters: transfer$refToJson("parameters", parameters, definitions),
@@ -2461,11 +2432,11 @@ function handleDefinitions(obj, map, depth) {
 function getSwaggerInfoFromJson(swaggerJson) {
   return jsonSchemaRefParser(transferOpenAPI3ToSwagger2$1(swaggerJson));
 }
-function getApiInfo(api, swaggerInfo) {
+function getApiInfo(api2, swaggerInfo) {
   const realSwaggerInfo = jsonSchemaRefParser(transferOpenAPI3ToSwagger2$1(swaggerInfo));
-  return buildSwaggerApiJson(api, realSwaggerInfo);
+  return buildSwaggerApiJson(api2, realSwaggerInfo);
 }
-function api2SchemaFromSwaggerApiInfo(api, schemaType, apiInfo, extraSchema = {}) {
+function api2SchemaFromSwaggerApiInfo(api2, schemaType, apiInfo, extraSchema = {}) {
   const { parameters = [], responses = [], method = "" } = apiInfo || {};
   const methodUpperCase = method.toUpperCase();
   const result = {
@@ -2488,8 +2459,8 @@ function api2SchemaFromSwaggerApiInfo(api, schemaType, apiInfo, extraSchema = {}
           tableColumns: "$RET.data.tableColumns",
           totalCount: "$RET.data.paging.totalCount"
         },
-        value: api,
-        url: api
+        value: api2,
+        url: api2
       },
       filter: {
         maxVisibleRow: 2,
@@ -2534,8 +2505,8 @@ function api2SchemaFromSwaggerApiInfo(api, schemaType, apiInfo, extraSchema = {}
         watch: [],
         params: {},
         formatResponseData: {},
-        value: api,
-        url: api
+        value: api2,
+        url: api2
       },
       initApi: [],
       effectApi: [],
@@ -2574,7 +2545,7 @@ function api2SchemaFromSwaggerApiInfo(api, schemaType, apiInfo, extraSchema = {}
           label: "\u57FA\u7840\u4FE1\u606F",
           source: [
             {
-              url: api,
+              url: api2,
               method: methodUpperCase,
               type: "ajax",
               formatResponseData: {
@@ -2607,8 +2578,8 @@ function api2SchemaFromSwaggerApiInfo(api, schemaType, apiInfo, extraSchema = {}
         formatResponseData: {
           tableData: "$RET.data.tableData"
         },
-        value: api,
-        url: api
+        value: api2,
+        url: api2
       },
       submitApi: {
         type: "ajax",
@@ -2646,9 +2617,9 @@ function api2SchemaFromSwaggerApiInfo(api, schemaType, apiInfo, extraSchema = {}
   }
   return merge_1(result, extraSchema);
 }
-function api2SchemaFromSwagger(api, schemaType, swaggerInfo, extraSchema = {}) {
-  const apiInfo = getApiInfo(api, swaggerInfo);
-  return api2SchemaFromSwaggerApiInfo(api, schemaType, apiInfo, extraSchema);
+function api2SchemaFromSwagger(api2, schemaType, swaggerInfo, extraSchema = {}) {
+  const apiInfo = getApiInfo(api2, swaggerInfo);
+  return api2SchemaFromSwaggerApiInfo(api2, schemaType, apiInfo, extraSchema);
 }
 function transferOpenAPI3ToSwagger2$1(data) {
   if (data && data.components && data.components.schemas) {
@@ -2784,10 +2755,10 @@ class MiddleItem extends JSONWatch {
 }
 class FtpSchema$1 extends Schema {
   constructor(props, isCompleteSchema = false) {
-    const { api, filter, headerToolbar, table, tabs, middleModules, ...more2 } = isCompleteSchema ? props.body : props;
+    const { api: api2, filter, headerToolbar, table, tabs, middleModules, ...more2 } = isCompleteSchema ? props.body : props;
     super(more2);
     this.type = "ftp";
-    this.api = new AjaxSchema(api);
+    this.api = new AjaxSchema(api2);
     this.filter = new Filter(filter);
     this.headerToolbar = new HeaderToolbar$1(headerToolbar);
     this.table = new TableSchema$2(table);
@@ -2861,12 +2832,12 @@ class FtpSchema$1 extends Schema {
   }
   initFromCache(schema) {
     const { body, ...more2 } = schema;
-    const { api, filter, headerToolbar, table, tabs, middleModules } = body;
+    const { api: api2, filter, headerToolbar, table, tabs, middleModules } = body;
     if (this.willDetach) {
       this.willDetach();
     }
     this.init(more2);
-    this.api.updateAll(api);
+    this.api.updateAll(api2);
     this.filter.updateAll(filter);
     this.headerToolbar.updateAll(headerToolbar);
     this.table.updateAll(this.compatTableHandle(table));
@@ -3205,11 +3176,11 @@ function getWatchByRequest(params) {
 }
 class FormilyFormV2Schema extends Schema {
   constructor(props, isCompleteSchema = false) {
-    const { api, initApi, effectApi, baseInfo, fields: fields2, ...more2 } = isCompleteSchema ? props.body : props;
+    const { api: api2, initApi, effectApi, baseInfo, fields: fields2, ...more2 } = isCompleteSchema ? props.body : props;
     super(more2);
     this.type = "formily-form-v2";
     this.baseInfo = new FormInfo(baseInfo);
-    this.api = new AjaxSchema(api);
+    this.api = new AjaxSchema(api2);
     if (!initApi) {
       this.initApi = new AjaxSchemaQueue([]);
     } else {
@@ -3251,12 +3222,12 @@ class FormilyFormV2Schema extends Schema {
   }
   initFromCache(schema) {
     const { body, ...more2 } = schema;
-    const { api, initApi = [], effectApi = [], baseInfo, fields: fields2 } = body;
+    const { api: api2, initApi = [], effectApi = [], baseInfo, fields: fields2 } = body;
     if (this.willDetach) {
       this.willDetach();
     }
     this.init(more2);
-    this.api.updateAll(api);
+    this.api.updateAll(api2);
     if (!initApi) {
       this.initApi.updateAll([]);
     } else {
@@ -13186,23 +13157,23 @@ function useSwagger() {
     }
   };
 }
-function createApiSelectItem(summary, api, method, request = []) {
+function createApiSelectItem(summary, api2, method, request = []) {
   return {
     summary,
-    label: `${summary} - ${method} ${api}`,
-    value: api,
-    url: api,
+    label: `${summary} - ${method} ${api2}`,
+    value: api2,
+    url: api2,
     method,
     request,
-    parameters: api.parameters
+    parameters: api2.parameters
   };
 }
 const getDataSourceArray$1 = (paths = {}) => {
   try {
     return Object.keys(paths).map((key) => {
-      const api = paths[key];
-      const apiPost = api.post || api.POST;
-      const apiGet = api.get || api.GET;
+      const api2 = paths[key];
+      const apiPost = api2.post || api2.POST;
+      const apiGet = api2.get || api2.GET;
       if (apiPost) {
         return createApiSelectItem(apiPost.summary, key, "POST");
       } else if (apiGet) {
@@ -13275,8 +13246,8 @@ class PersistentStorage {
 }
 var storage = new PersistentStorage();
 class DataSourceSchema extends JSONWatch {
-  constructor(api) {
-    const { url, method = "get", ...more2 } = api || {};
+  constructor(api2) {
+    const { url, method = "get", ...more2 } = api2 || {};
     super({
       url,
       method,
@@ -13988,10 +13959,10 @@ function emitterVSCodeMessage(action, content2) {
 function emitSave(fileMapContent) {
   emitterVSCodeMessage(EMIT_EVENT_ACTION_SAVE, fileMapContent);
 }
-const buildSchema = (schemaType, api, mainDataSource, moreProps) => {
+const buildSchema = (schemaType, api2, mainDataSource, moreProps) => {
   let schemaObj = null;
   if (schemaType === "ftp") {
-    schemaObj = new FtpSchema$1({ host: api, title: "" });
+    schemaObj = new FtpSchema$1({ host: api2, title: "" });
     const realDataSource = {
       ...mainDataSource,
       type: "ajax",
@@ -14004,14 +13975,14 @@ const buildSchema = (schemaType, api, mainDataSource, moreProps) => {
     };
     schemaObj.getDataSourcePanel().update(realDataSource);
   } else if (schemaType === "formily-form") {
-    schemaObj = new FormilyFormSchema({ host: api, title: "" });
+    schemaObj = new FormilyFormSchema({ host: api2, title: "" });
     const realDataSource = {
       ...mainDataSource,
       type: "ajax"
     };
     schemaObj.getDataSourcePanel().update(realDataSource);
   } else if (schemaType === "formily-form-v2") {
-    schemaObj = new FormilyFormV2Schema({ host: api, title: "" });
+    schemaObj = new FormilyFormV2Schema({ host: api2, title: "" });
     const realDataSource = {
       ...mainDataSource,
       type: "ajax"
@@ -14019,7 +13990,7 @@ const buildSchema = (schemaType, api, mainDataSource, moreProps) => {
     schemaObj.getApiPanel().update(realDataSource);
   } else if (schemaType === "detail") {
     if (moreProps == null ? void 0 : moreProps.children) {
-      schemaObj = new DetailSchema({ host: api, title: "", ...moreProps });
+      schemaObj = new DetailSchema({ host: api2, title: "", ...moreProps });
     } else {
       const realDataSource = {
         ...mainDataSource,
@@ -14028,10 +13999,10 @@ const buildSchema = (schemaType, api, mainDataSource, moreProps) => {
           detailData: "$RET.data"
         }
       };
-      schemaObj = new DetailSchema({ host: api, title: "", initDataSource: realDataSource });
+      schemaObj = new DetailSchema({ host: api2, title: "", initDataSource: realDataSource });
     }
   } else if (schemaType === "edit-table") {
-    schemaObj = new FtpSchema({ host: api, title: "", ...moreProps });
+    schemaObj = new FtpSchema({ host: api2, title: "", ...moreProps });
     const realDataSource = {
       ...mainDataSource,
       type: "ajax",
@@ -14058,8 +14029,8 @@ const buildSchema = (schemaType, api, mainDataSource, moreProps) => {
       }
     }, 500)
   );
-  if (api.indexOf("?") === -1 && api.indexOf("mocks") === -1) {
-    axios.defaults.baseURL = api;
+  if (api2.indexOf("?") === -1 && api2.indexOf("mocks") === -1) {
+    axios.defaults.baseURL = api2;
   }
   return schemaObj;
 };
@@ -14068,11 +14039,11 @@ const buildSchemaObjFromSchema = (schema) => {
     return null;
   }
   const { host, body } = schema;
-  const { type, api, ...more2 } = body || {};
+  const { type, api: api2, ...more2 } = body || {};
   if (!host || !type) {
     return null;
   }
-  return buildSchema(type, host, api, more2);
+  return buildSchema(type, host, api2, more2);
 };
 function useSchema() {
   const { fetchSwaggerInfo } = useSwagger$1();
@@ -16595,9 +16566,9 @@ function AjaxFormDialog({ title: title2 = "\u6570\u636E\u6E90\u914D\u7F6E", sche
     dataSource: swagger.apiList,
     defaultValue: schema.get("url"),
     onChange: (value) => {
-      const api = swagger.getApi(value);
-      if (api) {
-        schema.setAjaxRequest(value, api.method);
+      const api2 = swagger.getApi(value);
+      if (api2) {
+        schema.setAjaxRequest(value, api2.method);
       } else {
         schema.set("url", value);
       }
@@ -24534,6 +24505,10 @@ const columnsTypeOptionsWithEditCnTable = [
     value: "edit-cascader-select",
     label: "\u7EA7\u8054\u9009\u62E9\u5668"
   },
+  {
+    value: "blocks-table",
+    label: "\u5217\u8868\u533A\u5757"
+  },
   {
     value: "edit-custom",
     label: "\u81EA\u5B9A\u4E49"
@@ -25077,7 +25052,7 @@ var _immutabilityHelper_3_1_1_immutabilityHelper = { exports: {} };
   function type(obj) {
     return toString2.call(obj).slice(8, -1);
   }
-  var assign = Object.assign || function(target, source) {
+  var assign2 = Object.assign || function(target, source) {
     getAllKeys2(source).forEach(function(key) {
       if (hasOwnProperty2.call(source, key)) {
         target[key] = source[key];
@@ -25091,11 +25066,11 @@ var _immutabilityHelper_3_1_1_immutabilityHelper = { exports: {} };
     return Object.keys(obj);
   };
   function copy(object) {
-    return Array.isArray(object) ? assign(object.constructor(object.length), object) : type(object) === "Map" ? new Map(object) : type(object) === "Set" ? new Set(object) : object && typeof object === "object" ? assign(Object.create(Object.getPrototypeOf(object)), object) : object;
+    return Array.isArray(object) ? assign2(object.constructor(object.length), object) : type(object) === "Map" ? new Map(object) : type(object) === "Set" ? new Set(object) : object && typeof object === "object" ? assign2(Object.create(Object.getPrototypeOf(object)), object) : object;
   }
   var Context = function() {
     function Context2() {
-      this.commands = assign({}, defaultCommands);
+      this.commands = assign2({}, defaultCommands);
       this.update = this.update.bind(this);
       this.update.extend = this.extend = this.extend.bind(this);
       this.update.isEquals = function(x, y) {
@@ -25254,7 +25229,7 @@ var _immutabilityHelper_3_1_1_immutabilityHelper = { exports: {} };
   exports.isEquals = defaultContext.update.isEquals;
   exports.extend = defaultContext.extend;
   exports.default = defaultContext.update;
-  exports.default.default = module.exports = assign(exports.default, exports);
+  exports.default.default = module.exports = assign2(exports.default, exports);
   function invariantPushAndUnshift(value, spec, command) {
     invariant2(Array.isArray(value), function() {
       return "update(): expected target of " + stringifiable(command) + " to be an array; got " + stringifiable(value) + ".";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cniot/mdd-editor",
-  "version": "0.2.0-beta.8",
+  "version": "0.2.0-beta.9",
   "description": "模型驱动编辑器",
   "scripts": {
     "build": "vite build"

package/src/template/const.js

@@ -229,7 +229,10 @@ export const columnsTypeOptionsWithEditCnTable = [
     value: 'edit-cascader-select',
     label: '级联选择器',
   },
-
+  {
+    value: 'blocks-table',
+    label: '列表区块',
+  },
   {
     value: 'edit-custom',
     label: '自定义',