ronds-metadata 1.1.86 → 1.1.88

package/es/comps/FormGenerator/settings/index.js

@@ -1,31 +1,59 @@
 /*
  * @Author: wangxian
  * @Date: 2023-02-06 08:24:17
- * @LastEditTime: 2023-02-09 14:09:26
+ * @LastEditTime: 2023-02-09 19:32:19
  */
 import { RefRule, Rule } from './ruleConfig';
 export var inputSchema = [{
   id: 'inputSchema',
   type: 'object',
-  properties: [Rule.common.id, Rule.common.label, Rule.common.color, Rule.common.defaultValue, Rule.common.help, Rule.common.tooltip, Rule.common.placeholder, Rule.common.require, Rule.common.disabled, Rule.common.hidden, RefRule.common.depend.props, RefRule.common.rules.props],
-  types: [RefRule.common.depend.types]
+  properties: [Rule.common.id, Rule.common.label, Rule.common.color, Rule.common.colSpan, Rule.common.defaultValue, Rule.common.help, Rule.common.tooltip, Rule.common.placeholder, Rule.common.require, Rule.common.disabled, Rule.common.hidden, RefRule.common.depend.props, RefRule.common.rules.props],
+  types: [RefRule.common.depend.types, RefRule.common.rules.types]
 }];
 export var textareaSchema = [{
   id: 'textareaSchema',
   type: 'object',
-  properties: [Rule.common.id, Rule.common.label, Rule.common.color, Rule.common.defaultValue, Rule.common.help, Rule.common.tooltip, Rule.common.placeholder, Rule.common.require, Rule.common.disabled, Rule.common.hidden, RefRule.common.depend.props, RefRule.common.rules.props],
-  types: [RefRule.common.depend.types]
+  properties: [Rule.common.id, Rule.common.label, Rule.common.color, Rule.common.colSpan, Rule.common.defaultValue, Rule.common.help, Rule.common.tooltip, Rule.common.placeholder, Rule.common.require, Rule.common.disabled, Rule.common.hidden, RefRule.common.depend.props, RefRule.common.rules.props],
+  types: [RefRule.common.depend.types, RefRule.common.rules.types]
 }];
 export var dateSchema = [{
-  id: 'textareaSchema',
+  id: 'dateSchema',
   type: 'object',
-  properties: [Rule.common.id, Rule.common.label, Rule.common.color, Rule.common.defaultValue, Rule.common.help, Rule.common.tooltip, Rule.common.placeholder, Rule.common.require, Rule.common.disabled, Rule.common.hidden, RefRule.common.depend.props, RefRule.common.rules.props, RefRule.text.props],
-  types: [RefRule.common.depend.types, RefRule.text.types]
+  properties: [Rule.common.id, Rule.common.label, Rule.common.color, Rule.common.colSpan, Rule.common.defaultValue, Rule.common.help, Rule.common.tooltip, Rule.common.placeholder, Rule.common.require, Rule.common.disabled, Rule.common.hidden, RefRule.common.depend.props, RefRule.common.rules.props, RefRule.text.props],
+  types: [RefRule.common.depend.types, RefRule.text.types, RefRule.common.rules.types]
+}];
+export var numberSchema = [{
+  id: 'numberSchema',
+  type: 'object',
+  properties: [Rule.common.id, Rule.common.label, Rule.common.color, Rule.common.colSpan, Rule.common.defaultValue, Rule.common.help, Rule.common.tooltip, Rule.common.placeholder, Rule.common.require, Rule.common.disabled, Rule.common.hidden, RefRule.common.depend.props, RefRule.common.rules.props],
+  types: [RefRule.common.depend.types, RefRule.common.rules.types]
+}];
+export var switchSchema = [{
+  id: 'switchSchema',
+  type: 'object',
+  properties: [Rule.common.id, Rule.common.label, Rule.common.color, Rule.common.colSpan, Rule.common.defaultValue, Rule.common.help, Rule.common.tooltip, Rule.common.require, Rule.common.disabled, Rule.common.hidden, RefRule.common.depend.props],
+  types: [RefRule.common.depend.types]
+}];
+export var selectSchema = [{
+  id: 'switchSchema',
+  type: 'object',
+  properties: [Rule.common.id, Rule.common.label, Rule.common.color, Rule.common.colSpan, Rule.common.defaultValue, Rule.common.help, Rule.common.tooltip, Rule.common.require, Rule.common.disabled, Rule.common.hidden, RefRule.common.depend.props],
+  types: [RefRule.common.depend.types]
+}];
+export var mutiSelectSchema = [{
+  id: 'switchSchema',
+  type: 'object',
+  properties: [Rule.common.id, Rule.common.label, Rule.common.color, Rule.common.colSpan, Rule.common.defaultValue, Rule.common.help, Rule.common.tooltip, Rule.common.require, Rule.common.disabled, Rule.common.hidden, RefRule.common.depend.props],
+  types: [RefRule.common.depend.types]
 }];
 export var settingSchema = {
   input: inputSchema,
   textarea: textareaSchema,
-  dateSchema: dateSchema
+  date: dateSchema,
+  numebr: numberSchema,
+  switch: switchSchema,
+  select: selectSchema,
+  mutiSelect: mutiSelectSchema
 };
 export var inputParam = {
   type: 'text',
@@ -40,10 +68,29 @@ export var textareaParam = {
 };
 export var dateParam = {
   type: 'text',
-  schema: settingSchema.dateSchema,
+  schema: settingSchema.date,
   rule: {
     type: 'datePicker'
   }
+};
+export var numberParam = {
+  type: 'number',
+  schema: settingSchema.numebr
+};
+export var switchParam = {
+  type: 'bool',
+  schema: settingSchema.switch
+};
+export var selectParam = {
+  type: 'enum',
+  schema: settingSchema.select
+};
+export var mutiSelectParam = {
+  type: 'enum',
+  schema: settingSchema.mutiSelect,
+  rule: {
+    isMutiple: true
+  }
 }; // 基础组件列表渲染
 
 export var basicComps = [{
@@ -65,22 +112,22 @@ export var basicComps = [{
   id: 'number',
   name: '数字输入框',
   type: 'number',
-  param: inputParam
+  param: numberParam
 }, {
   id: 'switch',
   name: '开关',
   type: 'switch',
-  param: inputParam
+  param: switchParam
 }, {
   id: 'select',
   name: '下拉单选',
   type: 'select',
-  param: inputParam
+  param: selectParam
 }, {
   id: 'mutiSelect',
   name: '下拉多选',
   type: 'mutiSelect',
-  param: inputParam
+  param: mutiSelectParam
 }]; // 布局组件列表渲染
 
 export var layoutComps = [{

package/es/comps/FormGenerator/settings/ruleConfig.d.ts

@@ -38,6 +38,25 @@ export declare const Rule: {
                 };
             }[];
         };
+        colSpan: {
+            id: string;
+            type: string;
+            fields: {
+                id: string;
+                refId: string;
+                type: string;
+                value: {
+                    'common-en-US': {
+                        depend: {};
+                    };
+                    common: {
+                        label: string;
+                        tooltip: string;
+                        help: string;
+                    };
+                };
+            }[];
+        };
         defaultValue: {
             id: string;
             type: string;

package/es/comps/FormGenerator/settings/ruleConfig.js

@@ -1,7 +1,7 @@
 /*
  * @Author: wangxian
  * @Date: 2023-02-08 10:36:25
- * @LastEditTime: 2023-02-09 14:08:23
+ * @LastEditTime: 2023-02-09 15:36:22
  */
 import { DEFAULT_DATE_FORMAT } from '../../../comps/MetadataForm/DataCell/Input';
 export var Rule = {
@@ -44,6 +44,25 @@ export var Rule = {
         }
       }]
     },
+    colSpan: {
+      id: 'colSpan',
+      type: 'number',
+      fields: [{
+        id: 'Rule.Form',
+        refId: 'com.ronds.schema.default.Rule.Form',
+        type: 'ref',
+        value: {
+          'common-en-US': {
+            depend: {}
+          },
+          common: {
+            label: '组件布局',
+            tooltip: '默认按照整体布局配置排布',
+            help: '这里填写表单整体布局的倍数，最大一行'
+          }
+        }
+      }]
+    },
     defaultValue: {
       id: 'defaultValue',
       type: 'text',

package/es/comps/FormGenerator/transformer.js

@@ -4,7 +4,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 /*
  * @Author: wangxian
  * @Date: 2023-02-08 14:45:46
- * @LastEditTime: 2023-02-08 16:05:51
+ * @LastEditTime: 2023-02-09 14:50:08
  */
 import { deepClone } from '../../utils';
 var EMPTY_OBJ = [{

package/es/comps/MetadataForm/DataCell/Select.js

@@ -20,13 +20,14 @@ import _Cascader from "antd/es/cascader";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-09 14:24:16
+ * @LastEditTime: 2023-02-10 08:23:34
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -83,12 +84,32 @@ function Index(props) {
     var _watch = extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$http = extraInfo.http) === null || _extraInfo$http === void 0 ? void 0 : _extraInfo$http.watch;
 
     if (_watch && (p === null || p === void 0 ? void 0 : p.type) === 'onSelectChange') {
-      var _value = p === null || p === void 0 ? void 0 : p.payload[_watch];
+      var _watchArr = _watch.split(',');
+
+      if (_watchArr.length === 1) {
+        var _value = p === null || p === void 0 ? void 0 : p.payload[_watchArr[0]];
+
+        if (_value) {
+          setWatchValue(_value);
+          watchValueRef.current = _value;
+          formContext.form.setFieldsValue(_defineProperty({}, id, undefined));
+        }
+      } else {
+        for (var i = 0; i < _watchArr.length; i++) {
+          var w = _watchArr[i];
+
+          var _value2 = p === null || p === void 0 ? void 0 : p.payload[w];
+
+          if (_value2) {
+            var _wRef = watchValueRef.current || {};
+
+            _wRef[w] = _value2;
+            watchValueRef.current = _wRef;
+          }
+        }
 
-      if (_value) {
-        setWatchValue(_value);
-        watchValueRef.current = _value;
         formContext.form.setFieldsValue(_defineProperty({}, id, undefined));
+        setWatchValue(_objectSpread({}, watchValueRef.current));
       }
     }
   }, [formContext.stream$, extraInfo]);
@@ -105,11 +126,13 @@ function Index(props) {
               _url = page ? http.url.replace('{page}', page) : _url;
 
               if (watchValueRef.current) {
-                _url = _url.replace('{watch}', watchValueRef.current);
+                if (typeof watchValueRef.current === 'string') {
+                  _url = _url.replace('{watch}', watchValueRef.current);
+                }
               }
 
               _context.next = 6;
-              return server.GetEnumDataByUrl(_url);
+              return server.GetEnumDataByUrl(_url, http.method, (http === null || http === void 0 ? void 0 : http.body) && JSON.parse(http === null || http === void 0 ? void 0 : http.body) ? _objectSpread(_objectSpread({}, JSON.parse(http === null || http === void 0 ? void 0 : http.body)), watchValueRef.current || {}) : watchValueRef.current);
 
             case 6:
               res = _context.sent;

package/es/comps/MetadataForm/utils.js

@@ -9,7 +9,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-03 08:40:14
+ * @LastEditTime: 2023-02-09 15:53:44
  */
 import React from 'react';
 import Input from './DataCell/Input';
@@ -78,8 +78,17 @@ export function renderForm(schemaRef, options) {
   var _form = [];
 
   for (var i = 0; i < _properties.length; i++) {
+    var _properties$i, _properties$i2, _properties$i2$fields, _properties$i2$fields2;
+
+    var _colSpan = colSpan;
+    var compColSpan = ((_properties$i = _properties[i]) === null || _properties$i === void 0 ? void 0 : _properties$i.fields) && ((_properties$i2 = _properties[i]) === null || _properties$i2 === void 0 ? void 0 : (_properties$i2$fields = _properties$i2.fields[0]) === null || _properties$i2$fields === void 0 ? void 0 : (_properties$i2$fields2 = _properties$i2$fields.value) === null || _properties$i2$fields2 === void 0 ? void 0 : _properties$i2$fields2.colSpan);
+
+    if (compColSpan) {
+      _colSpan = compColSpan * colSpan <= 24 ? compColSpan * colSpan : 24;
+    }
+
     _form.push( /*#__PURE__*/React.createElement(_Col, {
-      span: colSpan
+      span: _colSpan
     }, getDataCell(_properties[i], options)));
   }
 

package/es/framework/metadata/MetadataService.d.ts

@@ -16,5 +16,5 @@ export declare class MetadataService {
     /** 获取元数据的值 */
     GetMetadataObjList(data: any): Promise<any[]>;
     /** 通过扩展规则获取枚举类型的值 */
-    GetEnumDataByUrl(url: string): Promise<any>;
+    GetEnumDataByUrl(url: string, method?: 'get' | 'post', body?: any): Promise<any>;
 }

package/es/framework/metadata/MetadataService.js

@@ -6,7 +6,7 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-21 08:35:21
+ * @LastEditTime: 2023-02-09 18:36:47
  */
 import Api from '../../api';
 var globalAPI = new Api();
@@ -138,13 +138,18 @@ export var MetadataService = /*#__PURE__*/function () {
     key: "GetEnumDataByUrl",
     value: function () {
       var _GetEnumDataByUrl = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(url) {
+        var method,
+            body,
+            _args5 = arguments;
         return _regeneratorRuntime.wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
-                return _context5.abrupt("return", this.api.GetEnumDataByUrl(url));
+                method = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : 'get';
+                body = _args5.length > 2 ? _args5[2] : undefined;
+                return _context5.abrupt("return", this.api.GetEnumDataByUrl(url, method, body));
 
-              case 1:
+              case 3:
               case "end":
                 return _context5.stop();
             }

package/es/framework/metadata/types.d.ts

@@ -1,98 +1,98 @@
-/*
- * @Author: wangxian
- * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-08-11 18:26:11
- */
-export type IMetaType = 'object' | 'ref' | 'bool' | 'number' | 'text' | 'enum' | 'array' | string;
-
-export type IMetaData = {
-  /**
-   * 类名称/属性名称
-   */
-  id: string;
-  /**
-   * 类型
-   */
-  type: IMetaType;
-  /**
-   * 属性
-   */
-  properties?: IMetaProperties[];
-
-  /**
-   * 引用id
-   */
-  refId?: string;
-  /**
-   * 静态的变量
-   */
-  fields?: IMetaFileds[];
-  /**
-   * 内部类
-   */
-  types?: IMetaData[];
-};
-
-export type IMetaProperties = {
-  /**
-   * 类规则名称
-   */
-  id: string;
-
-  /**
-   * 类型
-   */
-  type: IMetaType;
-
-  /**
-   * 引用id
-   */
-  refId?: string;
-  /**
-   * 静态的变量
-   */
-  fields?: IMetaFileds[];
-  /**
-   * 枚举值
-   */
-  enum?: { value: string }[];
-  /**
-   * 数组类型
-   */
-  items?: { type: IMetaType; refId?: string };
-};
-
-export type IMetaFileds = {
-  /**
-   * 规则名称
-   */
-  id: string;
-
-  /**
-   * 类型
-   */
-  type: IMetaType;
-
-  /**
-   * 引用id
-   */
-  refId?: string;
-
-  /**
-   * 规则值
-   */
-  value: any;
-};
-
-export interface IAPI {
-  // 获取元数据列表
-  GetMetadataList(keyWords?: string[]): Promise<{ id: string; name: string; schema: string }[]>;
-  // 通过元数据Id获取元数据详情
-  GetMetadataDetailById(metadataId: string): Promise<any>;
-  // 新增元数据
-  SaveMetadata(data: any, metadataTag: string): Promise<any>;
-  // 获取元数据的值
-  GetMetadataObjList(data: any): Promise<any[]>;
-  /** 通过扩展规则获取枚举类型的值 */
-  GetEnumDataByUrl(url: string): Promise<any>;
-}
+/*
+ * @Author: wangxian
+ * @Date: 2021-09-18 14:15:04
+ * @LastEditTime: 2023-02-09 18:37:15
+ */
+export type IMetaType = 'object' | 'ref' | 'bool' | 'number' | 'text' | 'enum' | 'array' | string;
+
+export type IMetaData = {
+  /**
+   * 类名称/属性名称
+   */
+  id: string;
+  /**
+   * 类型
+   */
+  type: IMetaType;
+  /**
+   * 属性
+   */
+  properties?: IMetaProperties[];
+
+  /**
+   * 引用id
+   */
+  refId?: string;
+  /**
+   * 静态的变量
+   */
+  fields?: IMetaFileds[];
+  /**
+   * 内部类
+   */
+  types?: IMetaData[];
+};
+
+export type IMetaProperties = {
+  /**
+   * 类规则名称
+   */
+  id: string;
+
+  /**
+   * 类型
+   */
+  type: IMetaType;
+
+  /**
+   * 引用id
+   */
+  refId?: string;
+  /**
+   * 静态的变量
+   */
+  fields?: IMetaFileds[];
+  /**
+   * 枚举值
+   */
+  enum?: { value: string }[];
+  /**
+   * 数组类型
+   */
+  items?: { type: IMetaType; refId?: string };
+};
+
+export type IMetaFileds = {
+  /**
+   * 规则名称
+   */
+  id: string;
+
+  /**
+   * 类型
+   */
+  type: IMetaType;
+
+  /**
+   * 引用id
+   */
+  refId?: string;
+
+  /**
+   * 规则值
+   */
+  value: any;
+};
+
+export interface IAPI {
+  // 获取元数据列表
+  GetMetadataList(keyWords?: string[]): Promise<{ id: string; name: string; schema: string }[]>;
+  // 通过元数据Id获取元数据详情
+  GetMetadataDetailById(metadataId: string): Promise<any>;
+  // 新增元数据
+  SaveMetadata(data: any, metadataTag: string): Promise<any>;
+  // 获取元数据的值
+  GetMetadataObjList(data: any): Promise<any[]>;
+  /** 通过扩展规则获取枚举类型的值 */
+  GetEnumDataByUrl(url: string, method: 'get' | 'post', body: any): Promise<any>;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "public": true,
   "name": "ronds-metadata",
-  "version": "1.1.86",
+  "version": "1.1.88",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",