ronds-metadata 1.1.93 → 1.1.95

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

@@ -1008,6 +1008,62 @@ export declare const mutiSelectParam: {
         isMutiple: boolean;
     };
 };
+export declare const colorParam: {
+    type: string;
+    schema: {
+        id: string;
+        type: string;
+        properties: ({
+            id: string;
+            type: string;
+            fields: {
+                id: string;
+                type: string;
+                refId: string;
+                value: {
+                    label: string;
+                };
+            }[];
+        } | {
+            id: string;
+            type: string;
+            fields: {
+                id: string;
+                type: string;
+                refId: string;
+                value: {
+                    common: {
+                        label: string;
+                    };
+                    'common-en-US': {};
+                };
+            }[];
+        })[];
+        types: {
+            id: string;
+            type: string;
+            properties: {
+                id: string;
+                type: string;
+                fields: {
+                    id: string;
+                    type: string;
+                    refId: string;
+                    value: {
+                        text: {};
+                        common: {
+                            label: string;
+                        };
+                        'common-en-US': {};
+                    };
+                }[];
+            }[];
+        }[];
+    }[];
+    rule: {
+        type: string;
+    };
+};
 export declare const basicComps: {
     id: string;
     name: string;
@@ -1054,6 +1110,117 @@ export declare const basicComps: {
         }[];
     };
 }[];
+export declare const complexComps: {
+    id: string;
+    name: string;
+    type: string;
+    param: {
+        type: string;
+        schema: {
+            id: string;
+            type: string;
+            properties: ({
+                id: string;
+                type: string;
+                fields: {
+                    id: string;
+                    type: string;
+                    refId: string;
+                    value: {
+                        label: string;
+                    };
+                }[];
+            } | {
+                id: string;
+                type: string;
+                fields: {
+                    id: string;
+                    type: string;
+                    refId: string;
+                    value: {
+                        common: {
+                            label: string;
+                        };
+                        'common-en-US': {};
+                    };
+                }[];
+            })[];
+            types: {
+                id: string;
+                type: string;
+                properties: {
+                    id: string;
+                    type: string;
+                    fields: {
+                        id: string;
+                        type: string;
+                        refId: string;
+                        value: {
+                            text: {};
+                            common: {
+                                label: string;
+                            };
+                            'common-en-US': {};
+                        };
+                    }[];
+                }[];
+            }[];
+        }[];
+    };
+}[];
+export declare const objParam: {
+    type: string;
+    schema: {
+        id: string;
+        type: string;
+        properties: ({
+            id: string;
+            type: string;
+            fields: {
+                id: string;
+                type: string;
+                refId: string;
+                value: {
+                    label: string;
+                };
+            }[];
+        } | {
+            id: string;
+            type: string;
+            fields: {
+                id: string;
+                type: string;
+                refId: string;
+                value: {
+                    common: {
+                        label: string;
+                    };
+                    'common-en-US': {};
+                };
+            }[];
+        })[];
+        types: {
+            id: string;
+            type: string;
+            properties: {
+                id: string;
+                type: string;
+                fields: {
+                    id: string;
+                    type: string;
+                    refId: string;
+                    value: {
+                        text: {};
+                        common: {
+                            label: string;
+                        };
+                        'common-en-US': {};
+                    };
+                }[];
+            }[];
+        }[];
+    }[];
+};
 export declare const layoutComps: {
     id: string;
     name: string;
@@ -1228,7 +1395,7 @@ export declare const formSettingSchema: {
                 };
                 common: {
                     label: string;
-                    tooltip: string;
+                    help: string;
                     depend: {};
                 };
             };
@@ -1307,7 +1474,7 @@ export declare const formSetting: {
                         };
                         common: {
                             label: string;
-                            tooltip: string;
+                            help: string;
                             depend: {};
                         };
                     };
@@ -1326,5 +1493,6 @@ export declare const streamEventType: {
     onNodeCopy: string;
     onClearCanvas: string;
     onSettingValueChange: string;
+    onTypesChange: string;
     onDropOver: string;
 };

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

@@ -3,7 +3,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 /*
  * @Author: wangxian
  * @Date: 2023-02-06 08:24:17
- * @LastEditTime: 2023-02-14 14:30:30
+ * @LastEditTime: 2023-02-17 08:53:34
  */
 import { RefRule, Rule } from './ruleConfig';
 export var inputSchema = [{
@@ -93,6 +93,13 @@ export var mutiSelectParam = {
   rule: {
     isMutiple: true
   }
+};
+export var colorParam = {
+  type: 'text',
+  schema: settingSchema.textarea,
+  rule: {
+    type: 'colorPicker'
+  }
 }; // 基础组件列表渲染
 
 export var basicComps = [{
@@ -130,13 +137,44 @@ export var basicComps = [{
   name: '下拉多选',
   type: 'mutiSelect',
   param: mutiSelectParam
-}]; // 布局组件列表渲染
+}]; // 基础组件列表渲染
+
+export var complexComps = [{
+  id: 'color',
+  name: '颜色选择',
+  type: 'color',
+  param: colorParam
+}, {
+  id: 'password',
+  name: '密码框',
+  type: 'password',
+  param: inputParam
+}, {
+  id: 'upload',
+  name: '上传',
+  type: 'upload',
+  param: textareaParam
+}, {
+  id: 'checkbox',
+  name: '多选框',
+  type: 'checkbox',
+  param: dateParam
+}, {
+  id: 'radio',
+  name: '单选框',
+  type: 'radio',
+  param: numberParam
+}];
+export var objParam = {
+  type: 'ref',
+  schema: settingSchema.input
+}; // 布局组件列表渲染
 
 export var layoutComps = [{
   id: 'obj',
   name: '对象',
   type: 'obj',
-  param: inputParam
+  param: objParam
 }, {
   id: 'list',
   name: '常规列表',
@@ -147,6 +185,9 @@ export var layoutComps = [{
 export var sidebarCtx = [{
   name: '基础组件',
   children: basicComps
+}, {
+  name: '高级组件',
+  children: complexComps
 }, {
   name: '布局组件',
   children: layoutComps
@@ -230,7 +271,7 @@ export var formSettingSchema = [{
         },
         common: {
           label: '标签宽度',
-          tooltip: '不填自适应默认宽度',
+          help: '不填自适应默认宽度',
           depend: {}
         }
       }
@@ -256,5 +297,6 @@ export var streamEventType = {
   onNodeCopy: 'onNodeCopy',
   onClearCanvas: 'onClearCanvas',
   onSettingValueChange: 'onSettingValueChange',
+  onTypesChange: 'onTypesChange',
   onDropOver: 'onDropOver'
 };

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

@@ -3,7 +3,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 /*
  * @Author: wangxian
  * @Date: 2023-02-08 10:36:25
- * @LastEditTime: 2023-02-10 19:38:32
+ * @LastEditTime: 2023-02-16 14:43:53
  */
 import { DEFAULT_DATE_FORMAT } from '../../../comps/MetadataForm/DataCell/Input';
 export var Rule = {
@@ -201,8 +201,6 @@ export var Rule = {
         value: 'textarea'
       }, {
         value: 'upload'
-      }, {
-        value: 'buttonCell'
       }],
       type: 'enum',
       fields: [{

package/es/comps/FormGenerator/transformer.d.ts

@@ -1,13 +1,7 @@
 import { FG } from '../../comps/FormGenerator/index.d';
-export declare const transFG2Schema: (nodes: FG.Node[], settings: any) => {
-    id: string;
-    type: string;
-    properties: any[];
-    fields: {
-        id: string;
-        type: string;
-        refId: string;
-        value: {};
-    }[];
+export declare const transFG2Schema: (nodes: FG.Node[], settings: any, _types?: any, schemaId?: string) => any;
+export declare const transSchema2FG: (schema: any) => {
+    nodes: any[];
+    setting: any[];
     types: any[];
-}[];
+};

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-10 18:18:23
+ * @LastEditTime: 2023-02-17 17:22:08
  */
 import { deepClone } from '../../utils';
 var EMPTY_OBJ = [{
@@ -16,8 +16,7 @@ var EMPTY_OBJ = [{
     type: 'ref',
     refId: 'com.ronds.schema.default.Rule.Form',
     value: {}
-  }],
-  types: []
+  }]
 }];
 var EMPTY_PROP = {
   id: '',
@@ -36,7 +35,12 @@ var renderProp = function renderProp(node, setting) {
   var _setting = setting && deepClone(setting) || {};
 
   _prop.id = (_setting === null || _setting === void 0 ? void 0 : _setting.id) || node.id;
-  _prop.type = node.param.type;
+  _prop.type = node.param.type; // ref类型加上refId
+
+  if (node.param.type === 'ref') {
+    _prop.refId = "".concat(_prop.id, "_ref");
+  }
+
   _prop.fields[0].value = _objectSpread(_objectSpread({}, _setting), {}, _defineProperty({
     label: (_setting === null || _setting === void 0 ? void 0 : _setting.label) || node.name
   }, node.param.type, _objectSpread({}, node.param.rule || _objectSpread({}, _setting[node.param.type]))));
@@ -44,23 +48,65 @@ var renderProp = function renderProp(node, setting) {
 }; // FG配置生成 metedata
 
 
-export var transFG2Schema = function transFG2Schema(nodes, settings) {
-  var schema = deepClone(EMPTY_OBJ);
-  var props = [];
+export var transFG2Schema = function transFG2Schema(nodes, settings, _types, schemaId) {
+  try {
+    var schema = deepClone(EMPTY_OBJ);
+
+    if (schemaId) {
+      schema[0].id = schemaId;
+    }
+
+    var props = [];
+    var types = [];
+
+    for (var i = 0; i < nodes.length; i++) {
+      var _prop = renderProp(nodes[i], settings && settings[nodes[i].id]);
+
+      props.push(_prop);
+    }
 
-  for (var i = 0; i < nodes.length; i++) {
-    var _prop = renderProp(nodes[i], settings[nodes[i].id]);
+    schema[0].properties = [].concat(props);
 
-    props.push(_prop);
+    if (settings && (settings === null || settings === void 0 ? void 0 : settings.formSetting)) {
+      schema[0].fields[0].value = deepClone(settings.formSetting);
+    } else {
+      delete schema[0].fields;
+    }
+
+    if (_types) {
+      var typeKeys = Object.keys(_types);
+
+      for (var _i = 0; _i < typeKeys.length; _i++) {
+        var _type = transFG2Schema(_types[typeKeys[_i]].nodes, settings["".concat(typeKeys[_i], "_ref")], undefined, "".concat(_types[typeKeys[_i]].id, "_ref"));
+
+        types.push(_type[0]);
+      }
+    }
+
+    if (types.length > 0) {
+      schema[0].types = [].concat(types);
+    }
+
+    return schema;
+  } catch (error) {
+    console.warn('transFG2Schema.err', error);
   }
+};
+
+var processProps = function processProps(prop) {}; // metadata 生成FG配置
+
 
-  schema[0].properties = [].concat(props);
+export var transSchema2FG = function transSchema2FG(schema) {
+  var res = {
+    nodes: [],
+    setting: [],
+    types: []
+  };
+  var _props = schema[0].properties; // { id: 'input', name: '输入框', type: 'input', param: inputParam },
 
-  if (settings.formSetting) {
-    schema[0].fields[0].value = deepClone(settings.formSetting);
-  } else {
-    delete schema[0].fields;
+  for (var i = 0; i < _props.length; i++) {
+    var obj = processProps(_props[i]);
   }
 
-  return schema;
+  return res;
 };

package/es/comps/JsonView/index.less

@@ -1,41 +1,41 @@
-pre {
-  margin: 0;
-  font-weight: 900;
-  font-size: 14px;
-}
-.string {
-  color: #3ab54a;
-}
-.number {
-  color: #25aae2;
-}
-.boolean {
-  color: #f98280;
-}
-.null {
-  color: #f1592a;
-}
-.width-10 {
-  width: 10px;
-}
-.key {
-  color: #92278f;
-}
-.open {
-  display: inline-block;
-  width: 12px;
-  height: 12px;
-  background: url('./icon/close.png') no-repeat;
-  background-size: 100% 100%;
-  vertical-align: middle;
-  cursor: pointer;
-}
-.close {
-  display: inline-block;
-  width: 12px;
-  height: 12px;
-  background: url('./icon/open.png') no-repeat;
-  background-size: 100% 100%;
-  vertical-align: middle;
-  cursor: pointer;
-}
+pre {
+  margin: 0;
+  font-weight: 900;
+  font-size: 14px;
+}
+.string {
+  color: #3ab54a;
+}
+.number {
+  color: #25aae2;
+}
+.boolean {
+  color: #f98280;
+}
+.null {
+  color: #f1592a;
+}
+.width-10 {
+  width: 10px;
+}
+.key {
+  color: #92278f;
+}
+.open {
+  display: inline-block;
+  width: 12px;
+  height: 12px;
+  background: url('./icon/close.png') no-repeat;
+  background-size: 100% 100%;
+  vertical-align: middle;
+  cursor: pointer;
+}
+.close {
+  display: inline-block;
+  width: 12px;
+  height: 12px;
+  background: url('./icon/open.png') no-repeat;
+  background-size: 100% 100%;
+  vertical-align: middle;
+  cursor: pointer;
+}

package/es/comps/MetadataEdit/index.less

@@ -1,10 +1,10 @@
-.metadata-edit {
-  height: 100%;
-  width: 100%;
-  .ant-row {
-    display: block;
-  }
-  .pr-10 {
-    padding-right: 10px;
-  }
-}
+.metadata-edit {
+  height: 100%;
+  width: 100%;
+  .ant-row {
+    display: block;
+  }
+  .pr-10 {
+    padding-right: 10px;
+  }
+}

package/es/comps/MetadataEdit/type.d.ts

@@ -1,20 +1,20 @@
-export interface IMetaFileds {
-  id: string;
-  type: 'object';
-  properties: any[];
-  value: any;
-}
-
-export type ITypeStatus = 'object' | 'ref' | 'bool' | 'number' | 'text' | 'enum' | 'array';
-
-export type IMetaProperty = {
-  /**
-   * 属性的名称
-   */
-  id: string;
-  /**
-   * 类型
-   */
-  type: string;
-  enum?: any[];
-};
+export interface IMetaFileds {
+  id: string;
+  type: 'object';
+  properties: any[];
+  value: any;
+}
+
+export type ITypeStatus = 'object' | 'ref' | 'bool' | 'number' | 'text' | 'enum' | 'array';
+
+export type IMetaProperty = {
+  /**
+   * 属性的名称
+   */
+  id: string;
+  /**
+   * 类型
+   */
+  type: string;
+  enum?: any[];
+};

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

@@ -31,7 +31,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-14 16:38:38
+ * @LastEditTime: 2023-02-16 14:32:47
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -41,6 +41,7 @@ import { deepClone } from '../../../utils';
 import { useAsyncMemo } from '../../../framework/hooks/use-async-memo';
 import { tr } from '../../../framework/locale';
 import useObservable from '../../../framework/rxjs-hooks/useObservable';
+import { assign } from '../utils';
 
 function Index(props) {
   var _extraInfo$depend, _extraInfo$http6, _extraInfo$http7, _extraInfo$http8, _extraInfo$http9;
@@ -91,11 +92,19 @@ function Index(props) {
       var _watchArr = _watch.split(',');
 
       if (_watchArr.length === 1) {
-        var _p$payload, _p$payload2, _p$payload3;
+        var evalString = '';
 
-        var _value = p === null || p === void 0 ? void 0 : (_p$payload = p.payload) === null || _p$payload === void 0 ? void 0 : _p$payload.allVals[_watchArr[0]];
+        for (var i = 0; i < name.length; i++) {
+          if (i < name.length - 1) {
+            evalString = "".concat(evalString, "[name[").concat(i, "]]");
+          }
+        }
+
+        var _value = eval("p?.payload?.allVals".concat(evalString, "[_watchArr[0]]"));
+
+        var _changeData = eval("p?.payload?.val".concat(evalString, "[_watchArr[0]]"));
 
-        if (_value && (p === null || p === void 0 ? void 0 : (_p$payload2 = p.payload) === null || _p$payload2 === void 0 ? void 0 : _p$payload2.val[_watchArr[0]])) {
+        if (_value && _changeData) {
           if ((extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.http.method) === 'post') {
             var _wRef = watchValueRef.current || {};
 
@@ -108,36 +117,43 @@ function Index(props) {
           }
         }
 
-        if (p === null || p === void 0 ? void 0 : (_p$payload3 = p.payload) === null || _p$payload3 === void 0 ? void 0 : _p$payload3.val[_watchArr[0]]) {
+        if (_changeData) {
           setTimeout(function () {
-            formContext.form.setFieldsValue(_defineProperty({}, id, undefined));
+            var v = {};
+            assign(name, undefined, v);
+            formContext.form.setFieldsValue(_objectSpread({}, v));
           }, 100);
         }
       } else {
         var b = false;
 
-        for (var i = 0; i < _watchArr.length; i++) {
-          var _p$payload4;
+        for (var _i = 0; _i < _watchArr.length; _i++) {
+          var w = _watchArr[_i];
+          var _evalString = '';
 
-          var w = _watchArr[i];
+          for (var _i2 = 0; _i2 < name.length; _i2++) {
+            if (_i2 < name.length - 1) {
+              _evalString = "".concat(_evalString, "[name[").concat(_i2, "]]");
+            }
+          }
 
-          var _value2 = p === null || p === void 0 ? void 0 : (_p$payload4 = p.payload) === null || _p$payload4 === void 0 ? void 0 : _p$payload4.allVals[w];
+          var _value2 = eval("p?.payload?.allVals".concat(_evalString, "[w]"));
 
           if (_value2) {
-            var _p$payload5;
-
             var _wRef2 = watchValueRef.current || {};
 
             _wRef2[w] = _value2;
             watchValueRef.current = _wRef2;
-            b = p === null || p === void 0 ? void 0 : (_p$payload5 = p.payload) === null || _p$payload5 === void 0 ? void 0 : _p$payload5.val[w];
+            b = eval("p?.payload?.val".concat(_evalString, "[w]"));
           }
         }
 
         if (b) {
           setWatchValue(_objectSpread({}, watchValueRef.current));
           setTimeout(function () {
-            formContext.form.setFieldsValue(_defineProperty({}, id, undefined));
+            var v = {};
+            assign(name, undefined, v);
+            formContext.form.setFieldsValue(_objectSpread({}, v));
           }, 100);
         }
       }