ronds-metadata 1.1.88 → 1.1.89

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

@@ -283,18 +283,6 @@ export declare const selectSchema: {
         properties: {
             id: string;
             type: string;
-            fields: {
-                id: string;
-                type: string;
-                refId: string;
-                value: {
-                    text: {};
-                    common: {
-                        label: string;
-                    };
-                    'common-en-US': {};
-                };
-            }[];
         }[];
     }[];
 }[];
@@ -333,18 +321,6 @@ export declare const mutiSelectSchema: {
         properties: {
             id: string;
             type: string;
-            fields: {
-                id: string;
-                type: string;
-                refId: string;
-                value: {
-                    text: {};
-                    common: {
-                        label: string;
-                    };
-                    'common-en-US': {};
-                };
-            }[];
         }[];
     }[];
 }[];
@@ -634,18 +610,6 @@ export declare const settingSchema: {
             properties: {
                 id: string;
                 type: string;
-                fields: {
-                    id: string;
-                    type: string;
-                    refId: string;
-                    value: {
-                        text: {};
-                        common: {
-                            label: string;
-                        };
-                        'common-en-US': {};
-                    };
-                }[];
             }[];
         }[];
     }[];
@@ -684,18 +648,6 @@ export declare const settingSchema: {
             properties: {
                 id: string;
                 type: string;
-                fields: {
-                    id: string;
-                    type: string;
-                    refId: string;
-                    value: {
-                        text: {};
-                        common: {
-                            label: string;
-                        };
-                        'common-en-US': {};
-                    };
-                }[];
             }[];
         }[];
     }[];
@@ -1008,18 +960,6 @@ export declare const selectParam: {
             properties: {
                 id: string;
                 type: string;
-                fields: {
-                    id: string;
-                    type: string;
-                    refId: string;
-                    value: {
-                        text: {};
-                        common: {
-                            label: string;
-                        };
-                        'common-en-US': {};
-                    };
-                }[];
             }[];
         }[];
     }[];
@@ -1061,26 +1001,60 @@ export declare const mutiSelectParam: {
             properties: {
                 id: string;
                 type: string;
+            }[];
+        }[];
+    }[];
+    rule: {
+        isMutiple: boolean;
+    };
+};
+export declare const basicComps: {
+    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: {
-                        text: {};
                         common: {
                             label: string;
                         };
                         'common-en-US': {};
                     };
                 }[];
+            })[];
+            types: {
+                id: string;
+                type: string;
+                properties: {
+                    id: string;
+                    type: string;
+                }[];
             }[];
         }[];
-    }[];
-    rule: {
-        isMutiple: boolean;
     };
-};
-export declare const basicComps: {
+}[];
+export declare const layoutComps: {
     id: string;
     name: string;
     type: string;
@@ -1138,15 +1112,53 @@ export declare const basicComps: {
         }[];
     };
 }[];
-export declare const layoutComps: {
-    id: string;
-    name: string;
-}[];
 export declare const sidebarCtx: {
     name: string;
     children: {
         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;
+                    }[];
+                }[];
+            }[];
+        };
     }[];
 }[];
 export declare const dragItemType = "fg-drag";
@@ -1314,4 +1326,5 @@ export declare const streamEventType: {
     onNodeCopy: string;
     onClearCanvas: string;
     onSettingValueChange: string;
+    onDropOver: string;
 };

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

@@ -1,50 +1,52 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+
 /*
  * @Author: wangxian
  * @Date: 2023-02-06 08:24:17
- * @LastEditTime: 2023-02-09 19:32:19
+ * @LastEditTime: 2023-02-14 14:30:30
  */
 import { RefRule, Rule } from './ruleConfig';
 export var inputSchema = [{
   id: 'inputSchema',
   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]
+  types: [].concat(_toConsumableArray(RefRule.common.depend.types), _toConsumableArray(RefRule.common.rules.types))
 }];
 export var textareaSchema = [{
   id: 'textareaSchema',
   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]
+  types: [].concat(_toConsumableArray(RefRule.common.depend.types), _toConsumableArray(RefRule.common.rules.types))
 }];
 export var dateSchema = [{
   id: 'dateSchema',
   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, RefRule.text.props],
-  types: [RefRule.common.depend.types, RefRule.text.types, RefRule.common.rules.types]
+  types: [].concat(_toConsumableArray(RefRule.common.depend.types), _toConsumableArray(RefRule.text.types), _toConsumableArray(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]
+  types: [].concat(_toConsumableArray(RefRule.common.depend.types), _toConsumableArray(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]
+  types: _toConsumableArray(RefRule.common.depend.types)
 }];
 export var selectSchema = [{
-  id: 'switchSchema',
+  id: 'selectSchema',
   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]
+  properties: [Rule.common.id, Rule.common.label, RefRule.enum.props, 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: [].concat(_toConsumableArray(RefRule.common.depend.types), _toConsumableArray(RefRule.enum.types))
 }];
 export var mutiSelectSchema = [{
-  id: 'switchSchema',
+  id: 'mutiSelectSchema',
   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]
+  properties: [Rule.common.id, Rule.common.label, RefRule.enum.props, 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: [].concat(_toConsumableArray(RefRule.common.depend.types), _toConsumableArray(RefRule.enum.types))
 }];
 export var settingSchema = {
   input: inputSchema,
@@ -132,10 +134,14 @@ export var basicComps = [{
 
 export var layoutComps = [{
   id: 'obj',
-  name: '对象'
+  name: '对象',
+  type: 'obj',
+  param: inputParam
 }, {
   id: 'list',
-  name: '常规列表'
+  name: '常规列表',
+  type: 'list',
+  param: inputParam
 }]; // Sidebar 内容配置
 
 export var sidebarCtx = [{
@@ -249,5 +255,6 @@ export var streamEventType = {
   onNodeDelete: 'onNodeDelete',
   onNodeCopy: 'onNodeCopy',
   onClearCanvas: 'onClearCanvas',
-  onSettingValueChange: 'onSettingValueChange'
+  onSettingValueChange: 'onSettingValueChange',
+  onDropOver: 'onDropOver'
 };

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

@@ -257,6 +257,7 @@ export declare const Rule: {
             }[];
         };
     };
+    enum: {};
 };
 export declare const RefRule: {
     common: {
@@ -296,7 +297,7 @@ export declare const RefRule: {
                         };
                     }[];
                 }[];
-            };
+            }[];
         };
         rules: {
             props: {
@@ -338,7 +339,7 @@ export declare const RefRule: {
                         };
                     }[];
                 }[];
-            };
+            }[];
         };
     };
     text: {
@@ -378,6 +379,35 @@ export declare const RefRule: {
                     };
                 }[];
             }[];
+        }[];
+    };
+    enum: {
+        props: {
+            id: string;
+            type: string;
+            refId: string;
+            fields: {
+                id: string;
+                type: string;
+                refId: string;
+                value: {
+                    common: {
+                        label: string;
+                    };
+                    ref: {
+                        titleHidden: boolean;
+                    };
+                    'common-en-US': {};
+                };
+            }[];
         };
+        types: {
+            id: string;
+            type: string;
+            properties: {
+                id: string;
+                type: string;
+            }[];
+        }[];
     };
 };

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

@@ -1,7 +1,9 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+
 /*
  * @Author: wangxian
  * @Date: 2023-02-08 10:36:25
- * @LastEditTime: 2023-02-09 15:36:22
+ * @LastEditTime: 2023-02-10 19:38:32
  */
 import { DEFAULT_DATE_FORMAT } from '../../../comps/MetadataForm/DataCell/Input';
 export var Rule = {
@@ -284,6 +286,172 @@ export var Rule = {
         }
       }]
     }
+  },
+  enum: {}
+};
+var Ref2Rule = {
+  enum: {
+    value: {
+      props: {
+        id: 'value',
+        type: 'array',
+        items: {
+          type: 'ref',
+          refId: 'enumValueRule'
+        },
+        fields: [{
+          id: 'com.ronds.schema.default.Rule.Form.Common',
+          type: 'ref',
+          refId: 'com.ronds.schema.default.Rule.Form.Common',
+          value: {
+            common: {
+              label: '枚举值'
+            },
+            'common-en-US': {},
+            array: {
+              layout: 'table',
+              rowNumber: 4
+            }
+          }
+        }]
+      },
+      types: [{
+        id: 'enumValueRule',
+        type: 'object',
+        properties: [{
+          id: 'key',
+          type: 'text'
+        }, {
+          id: 'value',
+          type: 'text'
+        }]
+      }]
+    },
+    http: {
+      props: {
+        id: 'http',
+        type: 'ref',
+        refId: 'httpRef',
+        fields: [{
+          id: 'Rule.Form',
+          type: 'ref',
+          refId: 'com.ronds.schema.default.Rule.Form',
+          value: {
+            common: {
+              label: '动态枚举值',
+              tooltip: '通过接口调用获取枚举值'
+            },
+            'common-en-US': {}
+          }
+        }]
+      },
+      types: [{
+        id: 'httpRef',
+        type: 'object',
+        properties: [{
+          id: 'url',
+          type: 'text',
+          fields: [{
+            id: 'Rule.Form',
+            type: 'ref',
+            refId: 'com.ronds.schema.default.Rule.Form',
+            value: {
+              text: {},
+              common: {
+                label: '请求URL'
+              },
+              'common-en-US': {}
+            }
+          }]
+        }, {
+          id: 'method',
+          type: 'enum',
+          enum: [{
+            value: 'get'
+          }, {
+            value: 'post'
+          }],
+          fields: [{
+            id: 'Rule.Form',
+            type: 'ref',
+            refId: 'com.ronds.schema.default.Rule.Form',
+            value: {
+              text: {},
+              common: {
+                label: '请求方法',
+                defaultValue: 'get'
+              },
+              'common-en-US': {}
+            }
+          }]
+        }, {
+          id: 'body',
+          type: 'text',
+          fields: [{
+            id: 'Rule.Form',
+            type: 'ref',
+            refId: 'com.ronds.schema.default.Rule.Form',
+            value: {
+              text: {},
+              common: {
+                label: 'Body参数',
+                help: '支持Json字符串，系统会自动序列化',
+                depend: {// show: `method=='post'`,
+                }
+              },
+              'common-en-US': {}
+            }
+          }]
+        }, {
+          id: 'key',
+          type: 'text',
+          fields: [{
+            id: 'Rule.Form',
+            type: 'ref',
+            refId: 'com.ronds.schema.default.Rule.Form',
+            value: {
+              text: {},
+              common: {
+                label: 'Key的替换属性'
+              },
+              'common-en-US': {}
+            }
+          }]
+        }, {
+          id: 'value',
+          type: 'text',
+          fields: [{
+            id: 'Rule.Form',
+            type: 'ref',
+            refId: 'com.ronds.schema.default.Rule.Form',
+            value: {
+              text: {},
+              common: {
+                label: 'Vaule的替换属性'
+              },
+              'common-en-US': {}
+            }
+          }]
+        }, {
+          id: 'watch',
+          type: 'text',
+          fields: [{
+            id: 'Rule.Form',
+            type: 'ref',
+            refId: 'com.ronds.schema.default.Rule.Form',
+            value: {
+              text: {},
+              common: {
+                label: '监听',
+                help: '监听多个属性，用英文逗号隔开',
+                placeholder: 'id,name'
+              },
+              'common-en-US': {}
+            }
+          }]
+        }]
+      }]
+    }
   }
 };
 export var RefRule = {
@@ -305,11 +473,11 @@ export var RefRule = {
           }
         }]
       },
-      types: {
+      types: [{
         id: 'dependRule',
         type: 'object',
         properties: [Rule.depend.show, Rule.depend.hidden]
-      }
+      }]
     },
     rules: {
       props: {
@@ -332,11 +500,11 @@ export var RefRule = {
           }
         }]
       },
-      types: {
+      types: [{
         id: 'rulesRule',
         type: 'object',
         properties: [Rule.rules.regExp, Rule.rules.message]
-      }
+      }]
     }
   },
   text: {
@@ -356,10 +524,36 @@ export var RefRule = {
         }
       }]
     },
-    types: {
+    types: [{
       id: 'textRule',
       type: 'object',
       properties: [Rule.text.format]
-    }
+    }]
+  },
+  enum: {
+    props: {
+      id: 'enum',
+      type: 'ref',
+      refId: 'enumRule',
+      fields: [{
+        id: 'Rule.Form',
+        type: 'ref',
+        refId: 'com.ronds.schema.default.Rule.Form',
+        value: {
+          common: {
+            label: '高级设置'
+          },
+          ref: {
+            titleHidden: true
+          },
+          'common-en-US': {}
+        }
+      }]
+    },
+    types: [{
+      id: 'enumRule',
+      type: 'object',
+      properties: [Ref2Rule.enum.value.props, Ref2Rule.enum.http.props]
+    }].concat(_toConsumableArray(Ref2Rule.enum.value.types), _toConsumableArray(Ref2Rule.enum.http.types))
   }
 };

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-09 14:50:08
+ * @LastEditTime: 2023-02-10 18:18:23
  */
 import { deepClone } from '../../utils';
 var EMPTY_OBJ = [{
@@ -39,7 +39,7 @@ var renderProp = function renderProp(node, setting) {
   _prop.type = node.param.type;
   _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 || {})));
+  }, node.param.type, _objectSpread({}, node.param.rule || _objectSpread({}, _setting[node.param.type]))));
   return _prop;
 }; // FG配置生成 metedata
 

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

@@ -12,11 +12,11 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-04 09:02:03
+ * @LastEditTime: 2023-02-10 14:10:03
  */
 import React from 'react';
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
-import { MetadataFormContext } from '../interface';
+import { MetadataFormContext, MetadataRefContext } from '../interface';
 import { useGetExtraInfo, useWatchDepend } from '../hooks';
 import { getDataCell } from '../utils';
 import { deepClone } from '../../../utils';
@@ -34,7 +34,21 @@ function Index(props) {
       name = props.name,
       disabled = props.disabled;
   var formContext = React.useContext(MetadataFormContext) || {};
-  var extraInfo = useGetExtraInfo(formContext.fields, id, formContext.form, props.type);
+  var refContext = React.useContext(MetadataRefContext) || {};
+
+  var _fileds = React.useMemo(function () {
+    var ff = formContext === null || formContext === void 0 ? void 0 : formContext.fields;
+
+    if (refContext === null || refContext === void 0 ? void 0 : refContext.fields) {
+      refContext === null || refContext === void 0 ? void 0 : refContext.fields.forEach(function (v, k) {
+        ff.set(k, v);
+      });
+    }
+
+    return ff;
+  }, [formContext === null || formContext === void 0 ? void 0 : formContext.fields, refContext === null || refContext === void 0 ? void 0 : refContext.fields]);
+
+  var extraInfo = useGetExtraInfo(formContext === null || formContext === void 0 ? void 0 : formContext.fields, id, formContext.form, props.type);
 
   var _React$useState = React.useState(),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -99,7 +113,7 @@ function Index(props) {
     rowNumber: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.rowNumber) || 10,
     refId: items.refId,
     form: formContext.form,
-    name: id
+    name: myName
   }) : /*#__PURE__*/React.createElement("div", {
     style: {
       padding: '10px',