ronds-metadata 1.2.11 → 1.2.13

package/es/comps/FormGenerator/comps/Canvas/core/RenderField/Cell/Date.js

@@ -9,6 +9,7 @@ var Index = function Index(props) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_DatePicker, {
     showTime: true,
     format: DEFAULT_DATE_FORMAT,
+    placeholder: setting === null || setting === void 0 ? void 0 : setting.placeholder,
     disabled: setting === null || setting === void 0 ? void 0 : setting.disabled
   }));
 };

package/es/comps/FormGenerator/comps/Canvas/core/RenderField/HOC/index.js

@@ -3,6 +3,8 @@ import _Button from "antd/es/button";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _extends from "@babel/runtime/helpers/esm/extends";
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
 import _objectDestructuringEmpty from "@babel/runtime/helpers/esm/objectDestructuringEmpty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
@@ -14,7 +16,7 @@ import { dragItemType, streamEventType } from '../../../../../settings';
 import useObservable from '../../../../../../../framework/rxjs-hooks/useObservable';
 export function withFieldCellWrapper(WrappedComponent) {
   return function (props) {
-    var _cellSetting$depend, _cellSetting$depend2, _cellSetting$depend3, _cellSetting$depend4;
+    var _cellSetting$depend, _cellSetting$depend2, _cellSetting$depend3, _cellSetting$depend4, _cellSetting$depend5, _cellSetting$depend6;
 
     var data = props.data,
         refId = props.refId,
@@ -207,11 +209,21 @@ export function withFieldCellWrapper(WrappedComponent) {
       style: {
         color: 'var(--ronds-metadata-color-text-2)'
       }
-    }, " [ hidden:", cellSetting === null || cellSetting === void 0 ? void 0 : (_cellSetting$depend2 = cellSetting.depend) === null || _cellSetting$depend2 === void 0 ? void 0 : _cellSetting$depend2.hidden, " ] "), (cellSetting === null || cellSetting === void 0 ? void 0 : (_cellSetting$depend3 = cellSetting.depend) === null || _cellSetting$depend3 === void 0 ? void 0 : _cellSetting$depend3.show) && /*#__PURE__*/React.createElement("span", {
+    }, /*#__PURE__*/React.createElement(_Tooltip, {
+      title: cellSetting === null || cellSetting === void 0 ? void 0 : (_cellSetting$depend2 = cellSetting.depend) === null || _cellSetting$depend2 === void 0 ? void 0 : _cellSetting$depend2.hidden
+    }, "[ depend.hidden ]")), (cellSetting === null || cellSetting === void 0 ? void 0 : (_cellSetting$depend3 = cellSetting.depend) === null || _cellSetting$depend3 === void 0 ? void 0 : _cellSetting$depend3.show) && /*#__PURE__*/React.createElement("span", {
       style: {
         color: 'var(--ronds-metadata-color-text-2)'
       }
-    }, " [ show:", cellSetting === null || cellSetting === void 0 ? void 0 : (_cellSetting$depend4 = cellSetting.depend) === null || _cellSetting$depend4 === void 0 ? void 0 : _cellSetting$depend4.show, " ] ")), /*#__PURE__*/React.createElement(_Form.Item, {
+    }, /*#__PURE__*/React.createElement(_Tooltip, {
+      title: cellSetting === null || cellSetting === void 0 ? void 0 : (_cellSetting$depend4 = cellSetting.depend) === null || _cellSetting$depend4 === void 0 ? void 0 : _cellSetting$depend4.show
+    }, "[ depend.show ]"), ' '), (cellSetting === null || cellSetting === void 0 ? void 0 : (_cellSetting$depend5 = cellSetting.depend) === null || _cellSetting$depend5 === void 0 ? void 0 : _cellSetting$depend5.notRequire) && /*#__PURE__*/React.createElement("span", {
+      style: {
+        color: 'var(--ronds-metadata-color-text-2)'
+      }
+    }, /*#__PURE__*/React.createElement(_Tooltip, {
+      title: cellSetting === null || cellSetting === void 0 ? void 0 : (_cellSetting$depend6 = cellSetting.depend) === null || _cellSetting$depend6 === void 0 ? void 0 : _cellSetting$depend6.notRequire
+    }, "[ depend.notRequire ]"), ' ')), /*#__PURE__*/React.createElement(_Form.Item, {
       key: "".concat(cellSetting === null || cellSetting === void 0 ? void 0 : cellSetting.defaultValue),
       name: (cellSetting === null || cellSetting === void 0 ? void 0 : cellSetting.id) || data.id,
       label: /*#__PURE__*/React.createElement("span", {

package/es/comps/FormGenerator/comps/Canvas/core/index.less

@@ -1,23 +1,23 @@
-.canvas-wrapper {
-  .drag-item {
-    position: relative;
-    border: 1px dashed var(--ronds-metadata-color-border-1);
-    background: var(--ronds-metadata-color-bg-4);
-    margin-bottom: 8px;
-  }
-
-  .drag-item-selected {
-    border: 1px solid var(--ronds-metadata-color-border-2);
-  }
-
-  .ant-form-item {
-    margin-bottom: '4px' !important;
-  }
-  .ant-form-item-label {
-    padding: 0 0 2px !important;
-  }
-  .ant-input-number,
-  .ant-picker {
-    width: 100%;
-  }
-}
+.canvas-wrapper {
+  .drag-item {
+    position: relative;
+    border: 1px dashed var(--ronds-metadata-color-border-1);
+    background: var(--ronds-metadata-color-bg-4);
+    margin-bottom: 8px;
+  }
+
+  .drag-item-selected {
+    border: 1px solid var(--ronds-metadata-color-border-2);
+  }
+
+  .ant-form-item {
+    margin-bottom: '4px' !important;
+  }
+  .ant-form-item-label {
+    padding: 0 0 2px !important;
+  }
+  .ant-input-number,
+  .ant-picker {
+    width: 100%;
+  }
+}

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

@@ -3,67 +3,67 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 /*
  * @Author: wangxian
  * @Date: 2023-02-06 08:24:17
- * @LastEditTime: 2023-02-27 10:08:44
+ * @LastEditTime: 2023-02-28 11:34:40
  */
 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],
+  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.br, Rule.common.hidden, RefRule.common.depend.props, RefRule.common.rules.props],
   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],
+  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.br, Rule.common.hidden, RefRule.common.depend.props, RefRule.common.rules.props],
   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],
+  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.br, Rule.common.hidden, RefRule.common.depend.props, RefRule.common.rules.props, RefRule.text.props],
   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],
+  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.br, Rule.common.hidden, RefRule.common.depend.props, RefRule.common.rules.props],
   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],
+  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.br, Rule.common.hidden, RefRule.common.depend.props],
   types: _toConsumableArray(RefRule.common.depend.types)
 }];
 export var selectSchema = [{
   id: 'selectSchema',
   type: 'object',
-  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],
+  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.br, Rule.common.hidden, RefRule.common.depend.props],
   types: [].concat(_toConsumableArray(RefRule.common.depend.types), _toConsumableArray(RefRule.enum.types))
 }];
 export var colorSchema = [{
   id: 'colorSchema',
   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],
+  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.br, Rule.common.hidden, RefRule.common.depend.props],
   types: _toConsumableArray(RefRule.common.depend.types)
 }];
 export var passwordSchema = [{
   id: 'passwordSchema',
   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],
+  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.br, Rule.common.hidden, RefRule.common.depend.props, RefRule.common.rules.props],
   types: [].concat(_toConsumableArray(RefRule.common.depend.types), _toConsumableArray(RefRule.common.rules.types))
 }];
 export var uploadSchema = [{
   id: 'uploadSchema',
   type: 'object',
-  properties: [Rule.common.id, Rule.common.label, Rule.common.color, Rule.common.colSpan, Rule.common.help, Rule.common.tooltip, Rule.common.require, Rule.common.disabled, RefRule.common.depend.props],
+  properties: [Rule.common.id, Rule.common.label, Rule.common.color, Rule.common.colSpan, Rule.common.help, Rule.common.tooltip, Rule.common.require, Rule.common.disabled, Rule.common.br, RefRule.common.depend.props],
   types: _toConsumableArray(RefRule.common.depend.types)
 }];
 export var checkboxSchema = [{
   id: 'checkboxSchema',
   type: 'object',
-  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],
+  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.br, Rule.common.hidden, RefRule.common.depend.props],
   types: [].concat(_toConsumableArray(RefRule.common.depend.types), _toConsumableArray(RefRule.enum.types))
 }];
 export var settingSchema = {

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

@@ -105,6 +105,19 @@ export declare const Rule: {
                 };
             }[];
         };
+        br: {
+            id: string;
+            type: string;
+            fields: {
+                id: string;
+                type: string;
+                refId: string;
+                value: {
+                    label: string;
+                    help: string;
+                };
+            }[];
+        };
         require: {
             id: string;
             type: string;
@@ -179,6 +192,23 @@ export declare const Rule: {
                 };
             }[];
         };
+        notRequire: {
+            id: string;
+            type: string;
+            fields: {
+                id: string;
+                type: string;
+                refId: string;
+                value: {
+                    text: {};
+                    common: {
+                        label: string;
+                        depend: {};
+                    };
+                    'common-en-US': {};
+                };
+            }[];
+        };
     };
     text: {
         type: {

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-16 14:43:53
+ * @LastEditTime: 2023-02-28 13:48:31
  */
 import { DEFAULT_DATE_FORMAT } from '../../../comps/MetadataForm/DataCell/Input';
 export var Rule = {
@@ -113,6 +113,19 @@ export var Rule = {
         }
       }]
     },
+    br: {
+      id: 'br',
+      type: 'bool',
+      fields: [{
+        id: 'com.ronds.schema.default.Rule.Form',
+        type: 'ref',
+        refId: 'com.ronds.schema.default.Rule.Form',
+        value: {
+          label: '是否换行',
+          help: '后面字段另起一行'
+        }
+      }]
+    },
     require: {
       id: 'require',
       type: 'bool',
@@ -186,6 +199,23 @@ export var Rule = {
           'common-en-US': {}
         }
       }]
+    },
+    notRequire: {
+      id: 'notRequire',
+      type: 'text',
+      fields: [{
+        id: 'Rule.Form',
+        type: 'ref',
+        refId: 'com.ronds.schema.default.Rule.Form',
+        value: {
+          text: {},
+          common: {
+            label: '非必填',
+            depend: {}
+          },
+          'common-en-US': {}
+        }
+      }]
     }
   },
   text: {
@@ -474,7 +504,7 @@ export var RefRule = {
       types: [{
         id: 'dependRule',
         type: 'object',
-        properties: [Rule.depend.show, Rule.depend.hidden]
+        properties: [Rule.depend.show, Rule.depend.hidden, Rule.depend.notRequire]
       }]
     },
     rules: {

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-27 16:38:58
+ * @LastEditTime: 2023-02-28 09:22:50
  */
 import { deepClone } from '../../utils';
 import { basicComps, complexComps, layoutComps } from './settings';
@@ -205,25 +205,25 @@ var getTypeJson = function getTypeJson(id, type, field) {
 
 
   if (type === 'enum') {
-    var _field$enum, _field$enum2, _field$enum3, _field$enum4;
+    var _field$enum, _field$enum2, _field$enum3, _field$enum4, _field$enum5, _field$enum6, _field$enum7, _field$enum8;
 
     // select
-    if ((field === null || field === void 0 ? void 0 : (_field$enum = field.enum) === null || _field$enum === void 0 ? void 0 : _field$enum.type) !== 'checkbox' && !field.enum.isMutiple) {
+    if ((field === null || field === void 0 ? void 0 : (_field$enum = field.enum) === null || _field$enum === void 0 ? void 0 : _field$enum.type) !== 'checkbox' && !((_field$enum2 = field.enum) === null || _field$enum2 === void 0 ? void 0 : _field$enum2.isMutiple)) {
       res = renderJson(basicComps, 'select', id, field);
     } // mutiSelect
 
 
-    if ((field === null || field === void 0 ? void 0 : (_field$enum2 = field.enum) === null || _field$enum2 === void 0 ? void 0 : _field$enum2.type) !== 'checkbox' && field.enum.isMutiple) {
+    if ((field === null || field === void 0 ? void 0 : (_field$enum3 = field.enum) === null || _field$enum3 === void 0 ? void 0 : _field$enum3.type) !== 'checkbox' && ((_field$enum4 = field.enum) === null || _field$enum4 === void 0 ? void 0 : _field$enum4.isMutiple)) {
       res = renderJson(basicComps, 'mutiSelect', id, field);
     } // checkbox
 
 
-    if ((field === null || field === void 0 ? void 0 : (_field$enum3 = field.enum) === null || _field$enum3 === void 0 ? void 0 : _field$enum3.type) === 'checkbox' && field.enum.isMutiple) {
+    if ((field === null || field === void 0 ? void 0 : (_field$enum5 = field.enum) === null || _field$enum5 === void 0 ? void 0 : _field$enum5.type) === 'checkbox' && ((_field$enum6 = field.enum) === null || _field$enum6 === void 0 ? void 0 : _field$enum6.isMutiple)) {
       res = renderJson(complexComps, 'checkbox', id, field);
     } // radio
 
 
-    if ((field === null || field === void 0 ? void 0 : (_field$enum4 = field.enum) === null || _field$enum4 === void 0 ? void 0 : _field$enum4.type) === 'checkbox' && !field.enum.isMutiple) {
+    if ((field === null || field === void 0 ? void 0 : (_field$enum7 = field.enum) === null || _field$enum7 === void 0 ? void 0 : _field$enum7.type) === 'checkbox' && !((_field$enum8 = field.enum) === null || _field$enum8 === void 0 ? void 0 : _field$enum8.isMutiple)) {
       res = renderJson(complexComps, 'radio', id, field);
     }
   } // obj

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;
+}