ronds-metadata 1.1.96 → 1.1.97

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

@@ -6,7 +6,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
  * @Author: uloveits 719310130@qq.com
  * @Date: 2023-02-06 15:05:42
  * @LastEditors: uloveits 719310130@qq.com
- * @LastEditTime: 2023-02-17 14:54:47
+ * @LastEditTime: 2023-02-21 16:32:27
  */
 import React from 'react';
 import CanvasCore from '../../index';
@@ -16,7 +16,8 @@ import { streamEventType } from '../../../../../settings/index';
 var Index = function Index(props) {
   var data = props.data,
       fgStream = props.fgStream,
-      setting = props.setting;
+      setting = props.setting,
+      types = props.types;
 
   var _React$useState = React.useState([]),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -24,13 +25,17 @@ var Index = function Index(props) {
       setNodes = _React$useState2[1];
 
   var nodesRef = React.useRef([]);
-  React.useEffect(function () {}, [setting]);
+  React.useEffect(function () {
+    if ((types === null || types === void 0 ? void 0 : types.nodes.length) > 0) {
+      setNodes(_toConsumableArray(types.nodes));
+      nodesRef.current = types.nodes;
+    }
+  }, [types]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CanvasCore, {
     key: data.id,
     refId: data.id,
+    nodes: nodes,
     onChange: function onChange(nodes) {
-      setNodes(_toConsumableArray(nodes));
-      nodesRef.current = nodes;
       fgStream && fgStream.next({
         type: streamEventType.onTypesChange,
         payload: _defineProperty({}, data.id, {

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

@@ -27,9 +27,20 @@ export function withFieldCellWrapper(WrappedComponent) {
 
     var _React$useState3 = React.useState(),
         _React$useState4 = _slicedToArray(_React$useState3, 2),
-        position = _React$useState4[0],
-        setPosition = _React$useState4[1];
-
+        types = _React$useState4[0],
+        setTypes = _React$useState4[1];
+
+    var _React$useState5 = React.useState(),
+        _React$useState6 = _slicedToArray(_React$useState5, 2),
+        position = _React$useState6[0],
+        setPosition = _React$useState6[1];
+
+    React.useEffect(function () {
+      if ((fGCtx === null || fGCtx === void 0 ? void 0 : fGCtx.types) && (fGCtx === null || fGCtx === void 0 ? void 0 : fGCtx.types[data.id])) {
+        //
+        setTypes(_objectSpread({}, fGCtx === null || fGCtx === void 0 ? void 0 : fGCtx.types[data.id]));
+      }
+    }, [fGCtx === null || fGCtx === void 0 ? void 0 : fGCtx.types]);
     var processFgStreamData = React.useCallback(function (p) {
       switch (p === null || p === void 0 ? void 0 : p.type) {
         case streamEventType.onSettingValueChange:
@@ -205,6 +216,7 @@ export function withFieldCellWrapper(WrappedComponent) {
       }]
     }, /*#__PURE__*/React.createElement(WrappedComponent, _extends({}, props, {
       fgStream: fGCtx.fgStream,
+      types: types,
       setting: cellSetting
     }))), isShowAction && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       ref: drag,

package/es/comps/FormGenerator/comps/Canvas/core/index.d.ts

@@ -6,6 +6,10 @@ interface ICanvasCoreProps {
      * 对象类型引用的
      */
     refId?: string;
+    /**
+     * 画布节点列表
+     */
+    nodes?: any[];
     /**
      * 渲染内容回调
      * @param nodes

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

@@ -4,8 +4,8 @@ import "antd/es/row/style";
 import _Row from "antd/es/row";
 import "antd/es/col/style";
 import _Col from "antd/es/col";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React from 'react';
 import { useDrop } from 'react-dnd';
@@ -20,6 +20,7 @@ var CanvasCore = function CanvasCore(props) {
   var _formSetting$layout;
 
   var refId = props.refId,
+      nodes = props.nodes,
       onChange = props.onChange;
   var fGCtx = React.useContext(FGCtx) || {};
 
@@ -45,6 +46,29 @@ var CanvasCore = function CanvasCore(props) {
       allSetting = _React$useState8[0],
       setAllSetting = _React$useState8[1];
 
+  var allSettingRef = React.useRef();
+  React.useEffect(function () {
+    if (refId && nodes.length > 0) {
+      setList(_toConsumableArray(nodes));
+      listRef.current = nodes;
+    }
+  }, [refId, nodes]); // 处理默认数据
+
+  var processDefaultValue = React.useCallback(function (data) {
+    if (!refId) {
+      setList(_toConsumableArray(data.nodes));
+      listRef.current = data.nodes;
+
+      if (data.types) {
+        fGCtx.fgStream && fGCtx.fgStream.next({
+          type: streamEventType.onTypesChange,
+          payload: data.types
+        });
+      }
+
+      onChange && onChange(data.nodes);
+    }
+  }, []);
   var addNewNode = React.useCallback(function (_node, dropId, position) {
     var _newNode;
 
@@ -149,17 +173,23 @@ var CanvasCore = function CanvasCore(props) {
 
         if ((p === null || p === void 0 ? void 0 : p.payload.refId) === refId) {
           if (refId) {
-            var _p$payload5;
+            var _p$payload5, _p$payload6;
 
             setAllSetting(_objectSpread({}, p === null || p === void 0 ? void 0 : (_p$payload5 = p.payload) === null || _p$payload5 === void 0 ? void 0 : _p$payload5.allSetting[refId]));
+            allSettingRef.current = _objectSpread({}, p === null || p === void 0 ? void 0 : (_p$payload6 = p.payload) === null || _p$payload6 === void 0 ? void 0 : _p$payload6.allSetting[refId]);
           } else {
-            var _p$payload6;
+            var _p$payload7, _p$payload8;
 
-            setAllSetting(_objectSpread({}, p === null || p === void 0 ? void 0 : (_p$payload6 = p.payload) === null || _p$payload6 === void 0 ? void 0 : _p$payload6.allSetting));
+            setAllSetting(_objectSpread({}, p === null || p === void 0 ? void 0 : (_p$payload7 = p.payload) === null || _p$payload7 === void 0 ? void 0 : _p$payload7.allSetting));
+            allSettingRef.current = _objectSpread({}, p === null || p === void 0 ? void 0 : (_p$payload8 = p.payload) === null || _p$payload8 === void 0 ? void 0 : _p$payload8.allSetting);
           }
         }
 
         break;
+
+      case streamEventType.onDefaultValue:
+        processDefaultValue(p === null || p === void 0 ? void 0 : p.payload);
+        break;
     }
   }, []);
   useObservable(function (p) {

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

@@ -67,43 +67,79 @@ var Canvas = function Canvas() {
       id: 'FormGenerator',
       type: 'object',
       properties: [{
-        id: 'obj-e5f4',
-        type: 'ref',
+        id: 'name',
+        type: 'text',
         fields: [{
           id: 'com.ronds.schema.default.Rule.Form',
           type: 'ref',
           refId: 'com.ronds.schema.default.Rule.Form',
           value: {
-            label: '对象',
-            ref: {}
+            common: {
+              id: 'name',
+              label: '名称',
+              color: '#d13333',
+              colSpan: 1,
+              defaultValue: '1',
+              help: '2',
+              tooltip: '3',
+              placeholder: '4',
+              require: true,
+              disabled: true,
+              rules: []
+            },
+            text: {}
           }
-        }],
-        refId: 'obj-e5f4_ref'
+        }]
       }, {
-        id: 'input-d4d3',
-        type: 'text',
+        id: 'config',
+        type: 'ref',
         fields: [{
           id: 'com.ronds.schema.default.Rule.Form',
           type: 'ref',
           refId: 'com.ronds.schema.default.Rule.Form',
           value: {
-            label: '输入框',
-            text: {}
+            common: {
+              id: 'config',
+              label: '配置中心',
+              color: '#5671c2',
+              depend: {}
+            },
+            ref: {}
           }
-        }]
+        }],
+        refId: 'Setting'
+      }],
+      fields: [{
+        id: 'com.ronds.schema.default.Rule.Form',
+        type: 'ref',
+        refId: 'com.ronds.schema.default.Rule.Form',
+        value: {
+          colSpan: 24,
+          layout: 'horizontal'
+        }
       }],
       types: [{
-        id: 'obj-e5f4_ref',
+        id: 'Setting',
         type: 'object',
         properties: [{
-          id: 'textarea-eb7d',
+          id: 'ege',
           type: 'text',
           fields: [{
             id: 'com.ronds.schema.default.Rule.Form',
             type: 'ref',
             refId: 'com.ronds.schema.default.Rule.Form',
             value: {
-              label: '文本框',
+              common: {
+                id: 'ege',
+                label: '年纪',
+                color: '#df8181',
+                defaultValue: '1',
+                help: '4',
+                tooltip: '333',
+                placeholder: '5',
+                rules: [null],
+                depend: {}
+              },
               text: {
                 type: 'textarea'
               }
@@ -112,7 +148,11 @@ var Canvas = function Canvas() {
         }]
       }]
     }];
-    var a = transSchema2FG(_schema);
+    var defaultValue = transSchema2FG(_schema);
+    fGCtx.fgStream && fGCtx.fgStream.next({
+      type: streamEventType.onDefaultValue,
+      payload: _objectSpread({}, defaultValue)
+    });
   };
 
   return /*#__PURE__*/React.createElement("div", {

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

@@ -29,7 +29,18 @@ var Settings = function Settings() {
   var refIdRef = React.useRef();
   var settingValueRef = React.useRef({
     formSetting: formSetting.param.defaultValue
-  });
+  }); // 处理默认数据
+
+  var processDefaultValue = React.useCallback(function (data) {
+    settingValueRef.current = data.settings;
+    fGCtx.fgStream && fGCtx.fgStream.next({
+      type: streamEventType.onSettingValueChange,
+      payload: _objectSpread(_objectSpread({}, data.settings), {}, {
+        allSetting: settingValueRef.current,
+        refId: refIdRef.current
+      })
+    });
+  }, []);
   var processFgStreamData = React.useCallback(function (p) {
     switch (p === null || p === void 0 ? void 0 : p.type) {
       case streamEventType.onNodeSelect:
@@ -62,6 +73,10 @@ var Settings = function Settings() {
         setCurNode(undefined);
         setCurTab('formSetting');
         break;
+
+      case streamEventType.onDefaultValue:
+        processDefaultValue(p === null || p === void 0 ? void 0 : p.payload);
+        break;
     }
   }, []);
   useObservable(function (p) {
@@ -109,8 +124,7 @@ var Settings = function Settings() {
     schema: (_curNode$param = curNode.param) === null || _curNode$param === void 0 ? void 0 : _curNode$param.schema,
     getFormInstance: function getFormInstance(form) {
       compFormRef.current = form;
-    } // layout="horizontal"
-    ,
+    },
     colSpan: 24,
     labelSpan: 8,
     onValuesChange: function onValuesChange(val, allVals) {

package/es/comps/FormGenerator/index.js

@@ -1,10 +1,12 @@
-import React from "react";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 
 /*
  * @Author: wangxian
  * @Date: 2023-02-04 13:45:31
- * @LastEditTime: 2023-02-09 14:50:24
+ * @LastEditTime: 2023-02-21 15:34:17
  */
+import React from 'react';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import Canvas from './comps/Canvas';
@@ -13,12 +15,36 @@ import Sidebar from './comps/Sidebar';
 import './index.less';
 import { FGCtx } from './Provider';
 import useMemoSubject from '../../framework/rxjs-hooks/useMemoSubject';
+import useObservable from '../../framework/rxjs-hooks/useObservable';
+import { streamEventType } from './settings';
 
 var FormGenerator = function FormGenerator(props) {
   var FGStream = useMemoSubject();
+
+  var _React$useState = React.useState({}),
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      types = _React$useState2[0],
+      setTypes = _React$useState2[1];
+
+  var typesRef = React.useRef({});
+  var processFgStreamData = React.useCallback(function (p) {
+    switch (p === null || p === void 0 ? void 0 : p.type) {
+      case streamEventType.onTypesChange:
+        if (p === null || p === void 0 ? void 0 : p.payload) {
+          typesRef.current = _objectSpread(_objectSpread({}, typesRef.current), p === null || p === void 0 ? void 0 : p.payload);
+          setTypes(_objectSpread({}, typesRef.current));
+        }
+
+        break;
+    }
+  }, []);
+  useObservable(function (p) {
+    processFgStreamData(p);
+  }, [FGStream]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FGCtx.Provider, {
     value: {
-      fgStream: FGStream
+      fgStream: FGStream,
+      types: types
     }
   }, /*#__PURE__*/React.createElement(DndProvider, {
     backend: HTML5Backend

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

@@ -1495,4 +1495,5 @@ export declare const streamEventType: {
     onSettingValueChange: string;
     onTypesChange: string;
     onDropOver: string;
+    onDefaultValue: 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-17 08:53:34
+ * @LastEditTime: 2023-02-21 14:19:44
  */
 import { RefRule, Rule } from './ruleConfig';
 export var inputSchema = [{
@@ -298,5 +298,6 @@ export var streamEventType = {
   onClearCanvas: 'onClearCanvas',
   onSettingValueChange: 'onSettingValueChange',
   onTypesChange: 'onTypesChange',
-  onDropOver: 'onDropOver'
+  onDropOver: 'onDropOver',
+  onDefaultValue: 'onDefaultValue'
 };

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

@@ -2,6 +2,6 @@ import { FG } from '../../comps/FormGenerator/index.d';
 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[];
+    settings: {};
+    types: {};
 };

package/es/comps/FormGenerator/transformer.js

@@ -4,9 +4,10 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 /*
  * @Author: wangxian
  * @Date: 2023-02-08 14:45:46
- * @LastEditTime: 2023-02-17 17:22:08
+ * @LastEditTime: 2023-02-21 14:51:10
  */
 import { deepClone } from '../../utils';
+import { basicComps, layoutComps } from './settings';
 var EMPTY_OBJ = [{
   id: 'FormGenerator',
   type: 'object',
@@ -41,9 +42,13 @@ var renderProp = function renderProp(node, setting) {
     _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]))));
+  var typeValue = _setting[node.param.type];
+  delete _setting[node.param.type];
+  _prop.fields[0].value = _defineProperty({
+    common: _objectSpread(_objectSpread({}, _setting), {}, {
+      label: (_setting === null || _setting === void 0 ? void 0 : _setting.label) || node.name
+    })
+  }, node.param.type, _objectSpread(_objectSpread({}, node.param.rule || {}), typeValue));
   return _prop;
 }; // FG配置生成 metedata
 
@@ -93,19 +98,116 @@ export var transFG2Schema = function transFG2Schema(nodes, settings, _types, sch
   }
 };
 
-var processProps = function processProps(prop) {}; // metadata 生成FG配置
+var renderJson = function renderJson(comps, type, id, field) {
+  var _field$common;
+
+  var _comps = deepClone(comps);
+
+  var node = _comps.find(function (it) {
+    return it.type === type;
+  });
+
+  node.id = id;
+  node.name = (field === null || field === void 0 ? void 0 : (_field$common = field.common) === null || _field$common === void 0 ? void 0 : _field$common.label) || node.name;
+
+  var _field = deepClone(field);
+
+  _field = _objectSpread(_objectSpread({}, _field), _field.common);
+  _field.id = id;
+  delete _field.common;
+
+  var setting = _defineProperty({}, id, _objectSpread({}, _field));
+
+  return {
+    node: node,
+    setting: setting
+  };
+};
+
+var getTypeJson = function getTypeJson(id, type, field) {
+  var res = {
+    node: {},
+    setting: {}
+  };
+
+  if (type === 'text') {
+    var _field$text, _field$text2;
+
+    // input
+    if (!(field === null || field === void 0 ? void 0 : (_field$text = field.text) === null || _field$text === void 0 ? void 0 : _field$text.type)) {
+      res = renderJson(basicComps, 'input', id, field);
+    } // textarea
+
+
+    if ((field === null || field === void 0 ? void 0 : (_field$text2 = field.text) === null || _field$text2 === void 0 ? void 0 : _field$text2.type) === 'textarea') {
+      var _field$text3;
+
+      field === null || field === void 0 ? true : (_field$text3 = field.text) === null || _field$text3 === void 0 ? true : delete _field$text3.type;
+      res = renderJson(basicComps, 'textarea', id, field);
+    }
+  } // obj
+
+
+  if (type === 'ref') {
+    res = renderJson(layoutComps, 'obj', id, field);
+  }
+
+  return res;
+};
+
+var processProps = function processProps(prop) {
+  // 获取是什么类型的组件
+  var obj = getTypeJson(prop.id, prop.type, prop.fields[0].value);
+  return obj;
+};
+
+var getTypeParent = function getTypeParent(refId, _props) {
+  var _ = _props.find(function (it) {
+    var _it$items;
+
+    return (it === null || it === void 0 ? void 0 : it.refId) === refId || (it === null || it === void 0 ? void 0 : (_it$items = it.items) === null || _it$items === void 0 ? void 0 : _it$items.refId) === refId;
+  });
+
+  return _;
+}; // metadata 生成FG配置
 
 
 export var transSchema2FG = function transSchema2FG(schema) {
+  var _schema$;
+
   var res = {
     nodes: [],
-    setting: [],
-    types: []
+    settings: {},
+    types: {}
   };
   var _props = schema[0].properties; // { id: 'input', name: '输入框', type: 'input', param: inputParam },
 
   for (var i = 0; i < _props.length; i++) {
     var obj = processProps(_props[i]);
+    res.nodes.push(obj.node);
+    res.settings = _objectSpread(_objectSpread({}, res.settings), obj.setting);
+  }
+
+  var _types = (_schema$ = schema[0]) === null || _schema$ === void 0 ? void 0 : _schema$.types;
+
+  if (_types && _types.length > 0) {
+    for (var _i2 = 0; _i2 < _types.length; _i2++) {
+      var _parent = getTypeParent(_types[_i2].id, _props);
+
+      if (_parent) {
+        var _schema = deepClone(_types[_i2]);
+
+        _schema.id = "".concat(_parent.id, "_ref");
+
+        var _ = transSchema2FG([_schema]);
+
+        res.types[_parent.id] = {
+          id: _parent.id,
+          nodes: _.nodes
+        };
+        res.settings[_schema.id] = _.settings;
+      }
+    }
   }
 
   return res;

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

@@ -12,24 +12,25 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-10 14:10:03
+ * @LastEditTime: 2023-02-21 19:21:07
  */
 import React from 'react';
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
-import { useGetExtraInfo, useWatchDepend } from '../hooks';
+import { useGetExtraInfo } from '../hooks';
 import { getDataCell } from '../utils';
 import { deepClone } from '../../../utils';
 import { tr } from '../../../framework/locale';
 import TableArray from './layout/TableArray';
 
 function Index(props) {
-  var _extraInfo$depend, _fieldRule$, _fieldRule$$value, _fieldRule$2, _fieldRule$2$value, _extraInfo$disabled;
+  var _fieldRule$, _fieldRule$$value, _fieldRule$2, _fieldRule$2$value, _extraInfo$disabled;
 
   var id = props.id,
       items = props.items,
       isRefForm = props.isRefForm,
       fieldRule = props.fields,
+      colSpan = props.colSpan,
       initEnumValue = props.initEnumValue,
       name = props.name,
       disabled = props.disabled;
@@ -55,7 +56,6 @@ function Index(props) {
       help = _React$useState2[0],
       setHelp = _React$useState2[1];
 
-  var depend = useWatchDepend(extraInfo.depend, formContext.stream$);
   var myName = React.useMemo(function () {
     var res = [];
 
@@ -74,15 +74,6 @@ function Index(props) {
       setHelp(arr[arr.length - 1]);
     }
   }, [items]);
-
-  if (depend.hidden) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null);
-  }
-
-  if ((extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$depend = extraInfo.depend) === null || _extraInfo$depend === void 0 ? void 0 : _extraInfo$depend.show) && !depend.show) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null);
-  }
-
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Row, null, /*#__PURE__*/React.createElement(_Col, {
     span: (formContext === null || formContext === void 0 ? void 0 : formContext.labelSpan) && (formContext === null || formContext === void 0 ? void 0 : formContext.layout) === 'horizontal' ? formContext === null || formContext === void 0 ? void 0 : formContext.labelSpan : 24
   }, !(extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.titleHidden) && /*#__PURE__*/React.createElement("div", {
@@ -147,7 +138,7 @@ function Index(props) {
         isRefForm: isRefForm,
         isShowTypeInfo: formContext.isShowTypeInfo,
         field: field
-      }), /*#__PURE__*/React.createElement(MinusCircleOutlined, {
+      }, colSpan), /*#__PURE__*/React.createElement(MinusCircleOutlined, {
         style: {
           marginLeft: '10px'
         },

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

@@ -17,16 +17,16 @@ import _Input from "antd/es/input";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-15 15:54:24
+ * @LastEditTime: 2023-02-21 19:15:22
  */
 import React from 'react';
 import { UploadOutlined } from '@ant-design/icons';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
-import { useGetExtraInfo, useWatchDepend } from '../hooks';
+import { useGetExtraInfo } from '../hooks';
 var TextArea = _Input.TextArea;
 
 function Index(props) {
-  var _extraInfo$depend, _extraInfo$addonAfter6;
+  var _extraInfo$addonAfter6;
 
   var id = props.id,
       isRefForm = props.isRefForm,
@@ -37,7 +37,6 @@ function Index(props) {
   var formContext = React.useContext(MetadataFormContext) || {};
   var formRefContext = React.useContext(MetadataRefContext);
   var extraInfo = useGetExtraInfo(formRefContext ? formRefContext.fields : formContext.fields, id, formContext.form, props.type);
-  var depend = useWatchDepend(extraInfo.depend, formContext.stream$);
 
   var _React$useState = React.useState([]),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -51,7 +50,7 @@ function Index(props) {
       var _ = _rules.map(function (it) {
         return {
           pattern: new RegExp(eval(it === null || it === void 0 ? void 0 : it.regExp), 'g'),
-          message: it.message
+          message: it === null || it === void 0 ? void 0 : it.message
         };
       });
 
@@ -118,15 +117,7 @@ function Index(props) {
           onChange: onChange
         });
     }
-  };
-
-  if (depend.hidden) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null);
-  }
-
-  if ((extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$depend = extraInfo.depend) === null || _extraInfo$depend === void 0 ? void 0 : _extraInfo$depend.show) && !depend.show) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null);
-  } // ref引用的  应用类型是否展示成表单
+  }; // ref引用的  应用类型是否展示成表单
 
 
   if (isObj && isRefForm && field) {

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

@@ -9,14 +9,14 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-09 14:23:44
+ * @LastEditTime: 2023-02-21 19:16:02
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
-import { useGetExtraInfo, useWatchDepend } from '../hooks';
+import { useGetExtraInfo } from '../hooks';
 
 function Index(props) {
-  var _extraInfo$depend, _extraInfo$disabled2, _extraInfo$disabled3;
+  var _extraInfo$disabled2, _extraInfo$disabled3;
 
   var id = props.id,
       name = props.name,
@@ -33,7 +33,6 @@ function Index(props) {
       rules = _React$useState2[0],
       setRules = _React$useState2[1];
 
-  var depend = useWatchDepend(extraInfo.depend, formContext.stream$);
   React.useEffect(function () {
     var _rules = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.rules;
 
@@ -49,14 +48,6 @@ function Index(props) {
     }
   }, [extraInfo]);
 
-  if (depend.hidden) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null);
-  }
-
-  if ((extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$depend = extraInfo.depend) === null || _extraInfo$depend === void 0 ? void 0 : _extraInfo$depend.show) && !depend.show) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null);
-  }
-
   if (isObj && isRefForm && field) {
     var _extraInfo$disabled;
 

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

@@ -18,12 +18,12 @@ import React from 'react';
 import { CaretDownOutlined, CaretUpOutlined } from '@ant-design/icons';
 import { MetadataService } from '../../../framework/metadata/MetadataService';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
-import { useGetExtraInfo, useWatchDepend } from '../hooks';
+import { useGetExtraInfo } from '../hooks';
 import { renderForm } from '../utils';
 import { JsonMetadataProvider } from '../../../framework/metadata';
 
 function Index(props) {
-  var _extraInfo$depend, _extraInfo$disabled, _extraInfo$disabled2;
+  var _extraInfo$disabled, _extraInfo$disabled2;
 
   var id = props.id,
       refId = props.refId,
@@ -63,7 +63,6 @@ function Index(props) {
       help = _React$useState10[0],
       setHelp = _React$useState10[1];
 
-  var depend = useWatchDepend(extraInfo.depend, formContext.stream$);
   var onSearch = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
     var param, server, res, _options, i, obj;
 
@@ -197,14 +196,6 @@ function Index(props) {
     }
   }, [refId]);
 
-  if (depend.hidden) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null);
-  }
-
-  if ((extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$depend = extraInfo.depend) === null || _extraInfo$depend === void 0 ? void 0 : _extraInfo$depend.show) && !depend.show) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null);
-  }
-
   if (isRefForm && !field && schema.length > 0) {
     var _fieldRule$, _fieldRule$$value, _fieldRule$2, _fieldRule$2$value, _fieldRule$2$value$co;
 

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

@@ -31,11 +31,11 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-16 14:32:47
+ * @LastEditTime: 2023-02-21 19:19:39
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
-import { useGetExtraInfo, useWatchDepend } from '../hooks';
+import { useGetExtraInfo } from '../hooks';
 import { MetadataService } from '../../../framework/metadata/MetadataService';
 import { deepClone } from '../../../utils';
 import { useAsyncMemo } from '../../../framework/hooks/use-async-memo';
@@ -44,7 +44,7 @@ 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;
+  var _extraInfo$http6, _extraInfo$http7, _extraInfo$http8, _extraInfo$http9;
 
   var id = props.id,
       name = props.name,
@@ -73,7 +73,6 @@ function Index(props) {
   var watchValueRef = React.useRef();
   var pageRef = React.useRef(1);
   var totalRef = React.useRef();
-  var depend = useWatchDepend(extraInfo.depend, formContext.stream$);
 
   var onSelect = function onSelect(value) {
     formContext.stream$ && formContext.stream$.next({
@@ -441,14 +440,6 @@ function Index(props) {
     }
   };
 
-  if (depend.hidden) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null);
-  }
-
-  if ((extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$depend = extraInfo.depend) === null || _extraInfo$depend === void 0 ? void 0 : _extraInfo$depend.show) && !depend.show) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null);
-  }
-
   if (isObj && isRefForm && field) {
     var _extraInfo$http4, _extraInfo$http5;
 

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

@@ -8,14 +8,14 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-09 14:24:29
+ * @LastEditTime: 2023-02-21 19:17:13
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
-import { useGetExtraInfo, useWatchDepend } from '../hooks';
+import { useGetExtraInfo } from '../hooks';
 
 function Index(props) {
-  var _extraInfo$depend, _extraInfo$disabled2, _extraInfo$disabled3;
+  var _extraInfo$disabled2, _extraInfo$disabled3;
 
   var id = props.id,
       name = props.name,
@@ -26,15 +26,6 @@ function Index(props) {
   var formContext = React.useContext(MetadataFormContext) || {};
   var formRefContext = React.useContext(MetadataRefContext);
   var extraInfo = useGetExtraInfo(formRefContext ? formRefContext.fields : formContext.fields, id, formContext.form, props.type);
-  var depend = useWatchDepend(extraInfo.depend, formContext.stream$);
-
-  if (depend.hidden) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null);
-  }
-
-  if ((extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$depend = extraInfo.depend) === null || _extraInfo$depend === void 0 ? void 0 : _extraInfo$depend.show) && !depend.show) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null);
-  }
 
   if (isObj && isRefForm && field) {
     var _extraInfo$disabled;

package/es/comps/MetadataForm/HOC/index.js

@@ -1,30 +1,39 @@
+import "antd/es/col/style";
+import _Col from "antd/es/col";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-
-/*
- * @Author: wangxian
- * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-11-22 15:37:46
- */
 import React from 'react';
 import { deepClone } from '../../../utils';
+import { useWatchDepend } from '../hooks';
+import { MetadataFormContext } from '../interface';
 import './index.less';
 export function withAddOnAfter(WrappedComponent) {
   return function (props) {
+    var _fields$, _fields$$value, _fields$$value$common, _fields$4, _fields$4$value, _fields$4$value$commo, _fields$4$value$commo2;
+
     var type = props.type,
         refId = props.refId,
         isShowTypeInfo = props.isShowTypeInfo,
+        fields = props.fields,
+        colSpan = props.colSpan,
         field = props.field,
         id = props.id,
         _props$name = props.name,
         name = _props$name === void 0 ? [] : _props$name,
         isObj = props.isObj;
+    var formContext = React.useContext(MetadataFormContext) || {};
+    var depend = useWatchDepend((_fields$ = fields[0]) === null || _fields$ === void 0 ? void 0 : (_fields$$value = _fields$.value) === null || _fields$$value === void 0 ? void 0 : (_fields$$value$common = _fields$$value.common) === null || _fields$$value$common === void 0 ? void 0 : _fields$$value$common.depend, formContext.stream$);
 
     var _React$useState = React.useState(),
         _React$useState2 = _slicedToArray(_React$useState, 2),
         help = _React$useState2[0],
         setHelp = _React$useState2[1];
 
+    var _React$useState3 = React.useState(),
+        _React$useState4 = _slicedToArray(_React$useState3, 2),
+        cellColSpan = _React$useState4[0],
+        setCellColSpan = _React$useState4[1];
+
     React.useEffect(function () {
       if (refId) {
         var arr = refId.split(':');
@@ -33,6 +42,18 @@ export function withAddOnAfter(WrappedComponent) {
 
       return function () {};
     }, [refId]);
+    React.useEffect(function () {
+      var _fields$2, _fields$2$value, _fields$2$value$commo, _fields$3, _fields$3$value;
+
+      var _colSpan = colSpan;
+      var compColSpan = fields && (((_fields$2 = fields[0]) === null || _fields$2 === void 0 ? void 0 : (_fields$2$value = _fields$2.value) === null || _fields$2$value === void 0 ? void 0 : (_fields$2$value$commo = _fields$2$value.common) === null || _fields$2$value$commo === void 0 ? void 0 : _fields$2$value$commo.colSpan) || ((_fields$3 = fields[0]) === null || _fields$3 === void 0 ? void 0 : (_fields$3$value = _fields$3.value) === null || _fields$3$value === void 0 ? void 0 : _fields$3$value.colSpan));
+
+      if (compColSpan) {
+        _colSpan = compColSpan * colSpan <= 24 ? compColSpan * colSpan : 24;
+      }
+
+      setCellColSpan(_colSpan);
+    }, [fields, colSpan]);
 
     var _name = React.useMemo(function () {
       if (id && name.length > 0 && !field) {
@@ -44,7 +65,18 @@ export function withAddOnAfter(WrappedComponent) {
       return [id];
     }, [id, name]);
 
-    return /*#__PURE__*/React.createElement("div", {
+    if (depend.hidden) {
+      return /*#__PURE__*/React.createElement(React.Fragment, null);
+    }
+
+    if (((_fields$4 = fields[0]) === null || _fields$4 === void 0 ? void 0 : (_fields$4$value = _fields$4.value) === null || _fields$4$value === void 0 ? void 0 : (_fields$4$value$commo = _fields$4$value.common) === null || _fields$4$value$commo === void 0 ? void 0 : (_fields$4$value$commo2 = _fields$4$value$commo.depend) === null || _fields$4$value$commo2 === void 0 ? void 0 : _fields$4$value$commo2.show) && !depend.show) {
+      return /*#__PURE__*/React.createElement(React.Fragment, null);
+    }
+
+    return /*#__PURE__*/React.createElement(_Col, {
+      key: id,
+      span: cellColSpan
+    }, /*#__PURE__*/React.createElement("div", {
       key: "".concat(_name.toString(), "_div"),
       className: "with-add-on-after"
     }, /*#__PURE__*/React.createElement(WrappedComponent, _extends({
@@ -58,6 +90,6 @@ export function withAddOnAfter(WrappedComponent) {
       isObj: isObj
     })), isShowTypeInfo && !field && type !== 'number' && type !== 'bool' && /*#__PURE__*/React.createElement("div", {
       className: "with-add-on-after-extra"
-    }, help !== null && help !== void 0 ? help : type));
+    }, help !== null && help !== void 0 ? help : type)));
   };
 }

package/es/comps/MetadataForm/hooks/index.js

@@ -5,7 +5,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: your name
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-04 10:43:01
+ * @LastEditTime: 2023-02-21 19:11:53
  */
 import { getLocale } from '../../../framework/locale';
 import moment from 'moment';
@@ -107,7 +107,7 @@ var processDependHiddenOrShow = function processDependHiddenOrShow(depend, chang
 
       var _key = key.split('.');
 
-      if (changeData[_key[0]]) {
+      if (changeData[_key[0]] || changeData[_key[0]] === 0) {
         var r = key === _key[0] ? "'".concat(changeData[_key[0]], "'") : eval("changeData[_key[0]].".concat(_key[1]));
         expression = expression.replace(key, r);
       } else {

package/es/comps/MetadataForm/index.js

@@ -111,6 +111,13 @@ var MetadataForm = function MetadataForm(props) {
           type: 'setFieldsValue',
           payload: vals
         });
+        stream$.next({
+          type: 'onValuesChange',
+          payload: {
+            val: vals,
+            allVals: vals
+          }
+        });
       };
 
       form.setFieldsValue = setFieldsValue;

package/es/comps/MetadataForm/interface.d.ts

@@ -40,6 +40,7 @@ export interface IMetaFormProps {
     name?: string[];
     isObj?: boolean;
     refId?: string;
+    colSpan: number;
     enum?: {
         value: string;
     }[];

package/es/comps/MetadataForm/utils.d.ts

@@ -1,5 +1,5 @@
 import { IFormOptions } from './interface';
-export declare function getDataCell(item: any, options: IFormOptions): JSX.Element;
+export declare function getDataCell(item: any, options: IFormOptions, colSpan: any): JSX.Element;
 /**
  *  渲染表单
  * @param schemaRef 元数据的schema

package/es/comps/MetadataForm/utils.js

@@ -1,7 +1,5 @@
 import "antd/es/row/style";
 import _Row from "antd/es/row";
-import "antd/es/col/style";
-import _Col from "antd/es/col";
 import "antd/es/spin/style";
 import _Spin from "antd/es/spin";
 import _extends from "@babel/runtime/helpers/esm/extends";
@@ -9,7 +7,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-20 16:04:04
+ * @LastEditTime: 2023-02-21 19:35:40
  */
 import React from 'react';
 import Input from './DataCell/Input';
@@ -24,10 +22,10 @@ var DataCellMap = {
   number: withAddOnAfter(Number),
   enum: withAddOnAfter(Select),
   bool: withAddOnAfter(Switch),
-  array: Array,
+  array: withAddOnAfter(Array),
   ref: withAddOnAfter(Ref)
 };
-export function getDataCell(item, options) {
+export function getDataCell(item, options, colSpan) {
   if (item.type && DataCellMap[item.type]) {
     var Comm = DataCellMap[item.type];
 
@@ -52,7 +50,8 @@ export function getDataCell(item, options) {
       field: options.field,
       name: options.pName,
       initEnumValue: options.initEnumValue,
-      isObj: options.isObj
+      isObj: options.isObj,
+      colSpan: colSpan
     }));
   }
 
@@ -78,19 +77,8 @@ 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, _properties$i2$fields3, _properties$i3, _properties$i3$fields, _properties$i3$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$fields3 = _properties$i2$fields2.common) === null || _properties$i2$fields3 === void 0 ? void 0 : _properties$i2$fields3.colSpan) || ((_properties$i3 = _properties[i]) === null || _properties$i3 === void 0 ? void 0 : (_properties$i3$fields = _properties$i3.fields[0]) === null || _properties$i3$fields === void 0 ? void 0 : (_properties$i3$fields2 = _properties$i3$fields.value) === null || _properties$i3$fields2 === void 0 ? void 0 : _properties$i3$fields2.colSpan));
-
-    if (compColSpan) {
-      _colSpan = compColSpan * colSpan <= 24 ? compColSpan * colSpan : 24;
-    }
-
-    _form.push( /*#__PURE__*/React.createElement(_Col, {
-      key: _properties[i].id,
-      span: _colSpan
-    }, getDataCell(_properties[i], options)));
+    // const depend = useWatchDepend({});
+    _form.push( /*#__PURE__*/React.createElement(React.Fragment, null, getDataCell(_properties[i], options, colSpan)));
   }
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Row, {

package/package.json

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