ronds-metadata 1.1.92 → 1.1.94

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

@@ -2,7 +2,7 @@
  * @Author: uloveits 719310130@qq.com
  * @Date: 2023-02-06 15:05:42
  * @LastEditors: uloveits 719310130@qq.com
- * @LastEditTime: 2023-02-14 19:14:21
+ * @LastEditTime: 2023-02-15 16:40:40
  */
 import CanvasCore from '../../index';
 import { withFieldCellWrapper } from '../HOC';

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

@@ -7,14 +7,15 @@ import _objectDestructuringEmpty from "@babel/runtime/helpers/esm/objectDestruct
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React from 'react';
+import { useDrag, useDrop } from 'react-dnd';
 import { DragOutlined, SnippetsOutlined, DeleteOutlined } from '@ant-design/icons';
 import { FGCtx } from '../../../../../Provider';
 import { dragItemType, streamEventType } from '../../../../../settings';
 import useObservable from '../../../../../../../framework/rxjs-hooks/useObservable';
-import { useDrag, useDrop } from 'react-dnd';
 export function withFieldCellWrapper(WrappedComponent) {
   return function (props) {
     var data = props.data,
+        refId = props.refId,
         isShowAction = props.isShowAction;
     var fGCtx = React.useContext(FGCtx) || {};
     var boxRef = React.useRef(null);
@@ -81,7 +82,8 @@ export function withFieldCellWrapper(WrappedComponent) {
           payload: {
             dragItem: item.dragItem,
             dropId: data.id,
-            position: position
+            position: position,
+            refId: refId
           }
         });
       },

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

@@ -1,6 +1,10 @@
 import { FG } from '../../../../index.d';
 interface IRenderFieldProps {
     data: FG.Node;
+    /**
+     * 对象类型引用的
+     */
+    refId?: string;
     isShowAction?: boolean;
 }
 declare const RenderField: (props: IRenderFieldProps) => JSX.Element;

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

@@ -1,7 +1,7 @@
 /*
  * @Author: wangxian
  * @Date: 2023-02-06 11:35:45
- * @LastEditTime: 2023-02-13 14:52:56
+ * @LastEditTime: 2023-02-15 16:19:46
  */
 import React from 'react';
 import Input from './Cell/Input';
@@ -16,6 +16,7 @@ import List from './Cell/List';
 
 var RenderField = function RenderField(props) {
   var data = props.data,
+      refId = props.refId,
       _props$isShowAction = props.isShowAction,
       isShowAction = _props$isShowAction === void 0 ? false : _props$isShowAction;
   var FieldContent = React.useMemo(function () {
@@ -25,6 +26,7 @@ var RenderField = function RenderField(props) {
       var Comm = DataCellMap[data.type];
       return /*#__PURE__*/React.createElement(Comm, {
         data: data,
+        refId: refId,
         isShowAction: isShowAction
       });
     }

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

@@ -97,7 +97,7 @@ var CanvasCore = function CanvasCore(props) {
     listRef.current = _list;
   }, []);
   var processFgStreamData = React.useCallback(function (p) {
-    var _p$payload, _p$payload3;
+    var _p$payload, _p$payload2, _p$payload4;
 
     switch (p === null || p === void 0 ? void 0 : p.type) {
       case streamEventType.onClearCanvas:
@@ -106,7 +106,10 @@ var CanvasCore = function CanvasCore(props) {
         break;
 
       case streamEventType.onDropOver:
-        addNewNode(p.payload.dragItem, p.payload.dropId, p.payload.position);
+        if (refId === ((_p$payload = p.payload) === null || _p$payload === void 0 ? void 0 : _p$payload.refId)) {
+          addNewNode(p.payload.dragItem, p.payload.dropId, p.payload.position);
+        }
+
         break;
 
       case streamEventType.onNodeCopy:
@@ -132,13 +135,13 @@ var CanvasCore = function CanvasCore(props) {
         break;
 
       case streamEventType.onSettingValueChange:
-        if (p === null || p === void 0 ? void 0 : (_p$payload = p.payload) === null || _p$payload === void 0 ? void 0 : _p$payload.formSetting) {
-          var _p$payload2;
+        if (p === null || p === void 0 ? void 0 : (_p$payload2 = p.payload) === null || _p$payload2 === void 0 ? void 0 : _p$payload2.formSetting) {
+          var _p$payload3;
 
-          setFormSetting(_objectSpread({}, p === null || p === void 0 ? void 0 : (_p$payload2 = p.payload) === null || _p$payload2 === void 0 ? void 0 : _p$payload2.formSetting));
+          setFormSetting(_objectSpread({}, p === null || p === void 0 ? void 0 : (_p$payload3 = p.payload) === null || _p$payload3 === void 0 ? void 0 : _p$payload3.formSetting));
         }
 
-        setAllSetting(_objectSpread({}, p === null || p === void 0 ? void 0 : (_p$payload3 = p.payload) === null || _p$payload3 === void 0 ? void 0 : _p$payload3.allSetting));
+        setAllSetting(_objectSpread({}, p === null || p === void 0 ? void 0 : (_p$payload4 = p.payload) === null || _p$payload4 === void 0 ? void 0 : _p$payload4.allSetting));
         break;
     }
   }, []);
@@ -242,6 +245,7 @@ var CanvasCore = function CanvasCore(props) {
         onSelect(it);
       }
     }, /*#__PURE__*/React.createElement(RenderField, {
+      refId: refId,
       data: it,
       isShowAction: curNodeId === it.id
     })));

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

@@ -1,6 +1,8 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
-import _extends from "@babel/runtime/helpers/esm/extends";
+import "antd/es/select/style";
+import _Select from "antd/es/select";
 import "antd/es/upload/style";
 import _Upload from "antd/es/upload";
 import "antd/es/button/style";
@@ -15,7 +17,7 @@ import _Input from "antd/es/input";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-09 14:22:54
+ * @LastEditTime: 2023-02-15 15:54:24
  */
 import React from 'react';
 import { UploadOutlined } from '@ant-design/icons';
@@ -24,7 +26,7 @@ import { useGetExtraInfo, useWatchDepend } from '../hooks';
 var TextArea = _Input.TextArea;
 
 function Index(props) {
-  var _extraInfo$depend;
+  var _extraInfo$depend, _extraInfo$addonAfter6;
 
   var id = props.id,
       isRefForm = props.isRefForm,
@@ -57,8 +59,10 @@ function Index(props) {
     }
   }, [extraInfo]);
 
+  var onChange = function onChange(e) {};
+
   var processInputType = function processInputType(_type) {
-    var _extraInfo$disabled, _extraInfo$disabled2, _extraInfo$disabled3, _extraInfo$disabled4, _extraInfo$disabled5;
+    var _extraInfo$disabled, _extraInfo$disabled2, _extraInfo$disabled3, _extraInfo$disabled4, _extraInfo$addonAfter, _extraInfo$addonAfter2, _extraInfo$addonAfter3, _extraInfo$addonAfter4, _extraInfo$disabled5;
 
     switch (_type) {
       case 'password':
@@ -98,9 +102,20 @@ function Index(props) {
 
       default:
         return /*#__PURE__*/React.createElement(_Input, {
+          addonAfter: ((_extraInfo$addonAfter = extraInfo.addonAfter) === null || _extraInfo$addonAfter === void 0 ? void 0 : _extraInfo$addonAfter.key) ? /*#__PURE__*/React.createElement(_Form.Item, {
+            name: [].concat(_toConsumableArray(name), [(_extraInfo$addonAfter2 = extraInfo.addonAfter) === null || _extraInfo$addonAfter2 === void 0 ? void 0 : _extraInfo$addonAfter2.key]),
+            noStyle: true,
+            initialValue: (_extraInfo$addonAfter3 = extraInfo.addonAfter) === null || _extraInfo$addonAfter3 === void 0 ? void 0 : _extraInfo$addonAfter3.defaultValue
+          }, /*#__PURE__*/React.createElement(_Select, null, (((_extraInfo$addonAfter4 = extraInfo.addonAfter) === null || _extraInfo$addonAfter4 === void 0 ? void 0 : _extraInfo$addonAfter4.value) || []).map(function (v) {
+            return /*#__PURE__*/React.createElement(_Select.Option, {
+              key: v,
+              value: v
+            }, v);
+          }))) : undefined,
           disabled: (_extraInfo$disabled5 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled5 !== void 0 ? _extraInfo$disabled5 : disabled,
           placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder,
-          allowClear: true
+          allowClear: true,
+          onChange: onChange
         });
     }
   };
@@ -111,9 +126,12 @@ function Index(props) {
 
   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引用的  应用类型是否展示成表单
+
 
   if (isObj && isRefForm && field) {
+    var _extraInfo$addonAfter5;
+
     return /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
       style: {
         flex: 1,
@@ -124,7 +142,7 @@ function Index(props) {
           color: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.color
         } : {}
       }, (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.label) || id),
-      name: [field === null || field === void 0 ? void 0 : field.name].concat(_toConsumableArray(name)),
+      name: (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$addonAfter5 = extraInfo.addonAfter) === null || _extraInfo$addonAfter5 === void 0 ? void 0 : _extraInfo$addonAfter5.key) ? [field === null || field === void 0 ? void 0 : field.name].concat(_toConsumableArray(name), ['value']) : [field === null || field === void 0 ? void 0 : field.name].concat(_toConsumableArray(name)),
       rules: [{
         required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
       }].concat(_toConsumableArray(rules)),
@@ -133,7 +151,10 @@ function Index(props) {
     }), processInputType((extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.type) || ''));
   }
 
-  return !field ? /*#__PURE__*/React.createElement(_Form.Item, {
+  return !field ?
+  /*#__PURE__*/
+  // 不是引用的
+  React.createElement(_Form.Item, {
     key: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.defaultValue,
     initialValue: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.defaultValue,
     style: {
@@ -144,7 +165,7 @@ function Index(props) {
         color: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.color
       } : {}
     }, (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.label) || id),
-    name: name,
+    name: (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$addonAfter6 = extraInfo.addonAfter) === null || _extraInfo$addonAfter6 === void 0 ? void 0 : _extraInfo$addonAfter6.key) ? [].concat(_toConsumableArray(name), ['value']) : name,
     rules: [{
       required: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.require
     }].concat(_toConsumableArray(rules)),

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 10:52:57
  */
 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);
         }
       }

package/package.json

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