@innoways/form-generator 9.0.7 → 9.0.8

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## 9.0.8
+
+### Patch Changes
+
+- feat: add dynamic variable support for form data in ActionField and utility functions 9.0.8
+- Updated dependencies
+  - @innoways/utils@9.0.8
+  - @innoways/drip-form@9.0.8
+  - @innoways/drip-form-theme-antd@9.0.8
+  - @innoways/hooks@9.0.8
+
 ## 9.0.7
 
 ### Patch Changes

package/dist/index.js

@@ -9177,6 +9177,7 @@ var styles = {"switch":"index-module_switch__1V9Dw"};
 function ownKeys$1(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread$1(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$1(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+var DYNAMIC_VAR_REGEX = /^\{\{formData\.([^.{}]+)\.formvalue\}\}$/; // TODO 支持设置组件的样式（根据组件的样式配置面板自动生成）；支持设置组件的校验和错误信息(根据组件的校验配置自动生成)
 
 var typeOptions = [{
   label: 'Form style',
@@ -9191,6 +9192,9 @@ var typeOptions = [{
   options: [{
     label: 'Set component value',
     value: 'data'
+  }, {
+    label: 'Set component dynamic value',
+    value: 'dynamic'
   }]
 }, {
   label: 'Interface',
@@ -9202,10 +9206,20 @@ var typeOptions = [{
 }];
 
 var Action = function Action(_ref) {
+  var _DYNAMIC_VAR_REGEX$ex, _DYNAMIC_VAR_REGEX$ex2;
+
   var effect = _ref.effect,
       _onChange = _ref.onChange;
   var fieldKey = effect.fieldKey,
-      value = effect.value;
+      value = effect.value; // Track dynamic mode locally so selecting 'dynamic' doesn't revert when value is empty
+
+  var _useState = useState(function () {
+    return typeof value === 'string' && DYNAMIC_VAR_REGEX.test(value);
+  }),
+      _useState2 = _slicedToArray(_useState, 2),
+      isDynamic = _useState2[0],
+      setIsDynamic = _useState2[1];
+
   var actionType = useMemo(function () {
     var actionType = 'data';
 
@@ -9216,7 +9230,7 @@ var Action = function Action(_ref) {
 
     switch (type) {
       case 'data':
-        actionType = 'data';
+        actionType = isDynamic ? 'dynamic' : 'data';
         break;
 
       case 'uiSchema':
@@ -9227,7 +9241,7 @@ var Action = function Action(_ref) {
     }
 
     return actionType;
-  }, [fieldKey]);
+  }, [fieldKey, isDynamic]);
   return /*#__PURE__*/React.createElement(Space, {
     align: "start"
   }, /*#__PURE__*/React.createElement(SelectField$1, {
@@ -9247,17 +9261,22 @@ var Action = function Action(_ref) {
     options: typeOptions,
     value: actionType,
     style: {
-      width: 160
+      width: 200
     },
     onChange: function onChange(value) {
+      setIsDynamic(value === 'dynamic');
       var fieldKey = effect.fieldKey.split(' ').shift(); // 设置的类型 data、uiSchema、dataSchema
+      // 'dynamic' is a UI-only mode that maps to 'data' in the fieldKey
 
-      var typeProperty = value.split('.');
+      var effectiveValue = value === 'dynamic' ? 'data' : value;
+      var typeProperty = effectiveValue.split('.');
       var type = typeProperty.shift();
       var property = typeProperty.join('.');
 
       _onChange(_objectSpread$1(_objectSpread$1({}, effect), {}, {
-        fieldKey: "".concat(fieldKey, " ").concat(type).concat(type != 'data' ? " ".concat(property) : '')
+        fieldKey: "".concat(fieldKey, " ").concat(type).concat(type != 'data' ? " ".concat(property) : ''),
+        // Clear value when switching modes
+        value: value === 'dynamic' ? '' : effect.value
       }, property === 'vcontrol' && typeCheck(effect.value) != 'Boolean' && {
         value: !!effect.value
       }));
@@ -9283,6 +9302,14 @@ var Action = function Action(_ref) {
     },
     depencyKey: fieldKey,
     mode: "set"
+  }), actionType === 'dynamic' && /*#__PURE__*/React.createElement(SelectField$1, {
+    value: typeof value === 'string' ? (_DYNAMIC_VAR_REGEX$ex = (_DYNAMIC_VAR_REGEX$ex2 = DYNAMIC_VAR_REGEX.exec(value)) === null || _DYNAMIC_VAR_REGEX$ex2 === void 0 ? void 0 : _DYNAMIC_VAR_REGEX$ex2[1]) !== null && _DYNAMIC_VAR_REGEX$ex !== void 0 ? _DYNAMIC_VAR_REGEX$ex : '' : '',
+    placeholder: "Select source field",
+    onChange: function onChange(selectedKey) {
+      _onChange(_objectSpread$1(_objectSpread$1({}, effect), {}, {
+        value: selectedKey ? "{{formData.".concat(selectedKey, ".formvalue}}") : ''
+      }));
+    }
   }));
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@innoways/form-generator",
-	"version": "9.0.7",
+	"version": "9.0.8",
 	"description": "drip-form 生成器",
 	"keywords": [
 		"hooks",
@@ -37,10 +37,10 @@
 		"@dnd-kit/modifiers": "^4.0.0",
 		"@dnd-kit/sortable": "^5.0.0",
 		"@dnd-kit/utilities": "^3.0.0",
-		"@innoways/drip-form": "^9.0.7",
-		"@innoways/drip-form-theme-antd": "^9.0.7",
-		"@innoways/hooks": "^9.0.7",
-		"@innoways/utils": "^9.0.7",
+		"@innoways/drip-form": "^9.0.8",
+		"@innoways/drip-form-theme-antd": "^9.0.8",
+		"@innoways/hooks": "^9.0.8",
+		"@innoways/utils": "^9.0.8",
 		"@monaco-editor/react": "^4.8.0-rc.2",
 		"monaco-editor": "^0.52.0",
 		"antd": "^4.16.13",