ronds-metadata 1.1.88 → 1.1.90

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

@@ -27,7 +27,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-10 08:23:34
+ * @LastEditTime: 2023-02-14 08:54:35
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -83,33 +83,60 @@ function Index(props) {
     // 判断是否有 watch的扩展属性
     var _watch = extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$http = extraInfo.http) === null || _extraInfo$http === void 0 ? void 0 : _extraInfo$http.watch;
 
-    if (_watch && (p === null || p === void 0 ? void 0 : p.type) === 'onSelectChange') {
+    if (_watch && (p === null || p === void 0 ? void 0 : p.type) === 'onValuesChange') {
       var _watchArr = _watch.split(',');
 
       if (_watchArr.length === 1) {
-        var _value = p === null || p === void 0 ? void 0 : p.payload[_watchArr[0]];
+        var _p$payload, _p$payload2;
+
+        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]];
 
         if (_value) {
-          setWatchValue(_value);
-          watchValueRef.current = _value;
-          formContext.form.setFieldsValue(_defineProperty({}, id, undefined));
+          if ((extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.http.method) === 'post') {
+            var _wRef = watchValueRef.current || {};
+
+            _wRef[_watchArr[0]] = _value;
+            watchValueRef.current = _wRef;
+            setWatchValue(_value);
+          } else {
+            setWatchValue(_value.toString());
+            watchValueRef.current = _value;
+          }
+        }
+
+        if (p === null || p === void 0 ? void 0 : (_p$payload2 = p.payload) === null || _p$payload2 === void 0 ? void 0 : _p$payload2.val[_watchArr[0]]) {
+          setTimeout(function () {
+            formContext.form.setFieldsValue(_defineProperty({}, id, undefined));
+          }, 100);
         }
       } else {
+        var b = false;
+
         for (var i = 0; i < _watchArr.length; i++) {
+          var _p$payload3;
+
           var w = _watchArr[i];
 
-          var _value2 = p === null || p === void 0 ? void 0 : p.payload[w];
+          var _value2 = p === null || p === void 0 ? void 0 : (_p$payload3 = p.payload) === null || _p$payload3 === void 0 ? void 0 : _p$payload3.allVals[w];
 
           if (_value2) {
-            var _wRef = watchValueRef.current || {};
+            var _p$payload4;
 
-            _wRef[w] = _value2;
-            watchValueRef.current = _wRef;
+            var _wRef2 = watchValueRef.current || {};
+
+            _wRef2[w] = _value2;
+            watchValueRef.current = _wRef2;
+            b = p === null || p === void 0 ? void 0 : (_p$payload4 = p.payload) === null || _p$payload4 === void 0 ? void 0 : _p$payload4.val[w];
           }
         }
 
-        formContext.form.setFieldsValue(_defineProperty({}, id, undefined));
         setWatchValue(_objectSpread({}, watchValueRef.current));
+
+        if (b) {
+          setTimeout(function () {
+            formContext.form.setFieldsValue(_defineProperty({}, id, undefined));
+          }, 100);
+        }
       }
     }
   }, [formContext.stream$, extraInfo]);

package/es/comps/MetadataForm/DataCell/layout/TableArray.d.ts

@@ -1,6 +1,6 @@
 import { FormInstance } from 'antd';
 interface ITableArrayProps {
-    name: string;
+    name: string | string[];
     form: FormInstance;
     refId: string;
     initEnumValue: any[];

package/es/comps/MetadataForm/DataCell/layout/TableArray.js

@@ -12,7 +12,7 @@ import { JsonMetadataProvider } from '../../../../framework/metadata';
 import Editable from '../../../../comps/Editable';
 import useObservable from '../../../../framework/rxjs-hooks/useObservable';
 import { MetadataFormContext } from '../../interface';
-import { getLabelByProps } from '../../utils';
+import { assign, getLabelByProps } from '../../utils';
 import { deepClone } from '../../../../utils';
 import { STREAM_EVENT_TYPE } from '../../constants';
 
@@ -55,27 +55,63 @@ var TableArray = function TableArray(props) {
       list = _React$useState10[0],
       setList = _React$useState10[1];
 
+  var listRef = React.useRef([]);
   useObservable(function (p) {
-    if ((p === null || p === void 0 ? void 0 : p.type) === 'setFieldsValue' && p.payload[name]) {
-      setList(_toConsumableArray(p.payload[name]));
+    if ((p === null || p === void 0 ? void 0 : p.type) === 'setFieldsValue') {
+      if (typeof name === 'string' && p.payload[name]) {
+        setList(_toConsumableArray(p.payload[name]));
+        listRef.current = p.payload[name];
+      } else if (p.payload[name[0]]) {
+        var evalString = 'p.payload';
+
+        for (var i = 0; i < name.length; i++) {
+          evalString = "".concat(evalString, "[name[").concat(i, "]]");
+        }
+
+        var _list = eval(evalString) || [];
+
+        setList(_toConsumableArray(_list));
+        listRef.current = _list;
+      }
     }
-  }, [formContext.stream$]);
+  }, [formContext.stream$, name]);
   useObservable(function (p) {
     if ((p === null || p === void 0 ? void 0 : p.type) === 'onValuesChange') {
-      var _p$payload;
-
-      var val = _defineProperty({}, "".concat(name), _objectSpread({
-        rowIdx: p === null || p === void 0 ? void 0 : (_p$payload = p.payload) === null || _p$payload === void 0 ? void 0 : _p$payload.rowIdx
-      }, p.payload.values));
-
-      var allVals = form.getFieldsValue();
-      formContext.stream$.next({
-        type: STREAM_EVENT_TYPE.ON_VALUES_CHANGE,
-        payload: {
-          val: val,
-          allVals: allVals
-        }
-      });
+      if (typeof name === 'string') {
+        var _p$payload;
+
+        var val = _defineProperty({}, "".concat(name), _objectSpread({
+          rowIdx: p === null || p === void 0 ? void 0 : (_p$payload = p.payload) === null || _p$payload === void 0 ? void 0 : _p$payload.rowIdx
+        }, p.payload.values));
+
+        var allVals = form.getFieldsValue();
+        allVals[name] = listRef.current;
+        formContext.stream$.next({
+          type: STREAM_EVENT_TYPE.ON_VALUES_CHANGE,
+          payload: {
+            val: val,
+            allVals: allVals
+          }
+        });
+      } else {
+        var _p$payload2;
+
+        var _val2 = {};
+
+        var _allVals = form.getFieldsValue();
+
+        assign(name, _objectSpread({
+          rowIdx: p === null || p === void 0 ? void 0 : (_p$payload2 = p.payload) === null || _p$payload2 === void 0 ? void 0 : _p$payload2.rowIdx
+        }, p.payload.values), _val2);
+        assign(name, _toConsumableArray(listRef.current), _allVals);
+        formContext.stream$.next({
+          type: STREAM_EVENT_TYPE.ON_VALUES_CHANGE,
+          payload: {
+            val: _val2,
+            allVals: _allVals
+          }
+        });
+      }
     }
   }, [tblStream]);
   var getSchemaByRefId = React.useCallback( /*#__PURE__*/function () {
@@ -149,7 +185,22 @@ var TableArray = function TableArray(props) {
   }, [refId]);
   React.useEffect(function () {
     if (initValue && firstLoadRef.current) {
-      setList(_toConsumableArray(initValue[name]));
+      if (typeof name === 'string' && initValue[name]) {
+        setList(_toConsumableArray(initValue[name]));
+        listRef.current = initValue[name];
+      } else if (initValue[name[0]]) {
+        var evalString = 'initValue';
+
+        for (var i = 0; i < name.length; i++) {
+          evalString = "".concat(evalString, "[name[").concat(i, "]]");
+        }
+
+        var _list = eval(evalString);
+
+        setList(_toConsumableArray(_list));
+        listRef.current = _list;
+      }
+
       firstLoadRef.current = false;
     }
   }, [initValue, form]);
@@ -186,7 +237,7 @@ var TableArray = function TableArray(props) {
   var processColumnType = React.useCallback(function (data, _extraInfo) {
     var _extraInfo$text;
 
-    if (data.type === 'text' && ((_extraInfo$text = _extraInfo.text) === null || _extraInfo$text === void 0 ? void 0 : _extraInfo$text.type)) {
+    if ((data === null || data === void 0 ? void 0 : data.type) === 'text' && (_extraInfo === null || _extraInfo === void 0 ? void 0 : (_extraInfo$text = _extraInfo.text) === null || _extraInfo$text === void 0 ? void 0 : _extraInfo$text.type)) {
       var _extraInfo$text2;
 
       return (_extraInfo$text2 = _extraInfo.text) === null || _extraInfo$text2 === void 0 ? void 0 : _extraInfo$text2.type;
@@ -206,8 +257,8 @@ var TableArray = function TableArray(props) {
         title: getLabelByProps(it),
         key: it.id,
         dataIndex: it.id,
-        width: processColumnType(it, extraInfo) === 'buttonCell' ? 60 : 100,
-        editable: !((_extraInfo$common = extraInfo.common) === null || _extraInfo$common === void 0 ? void 0 : _extraInfo$common.disabled),
+        width: processColumnType(it, extraInfo) === 'buttonCell' ? 25 : 50,
+        editable: !(extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$common = extraInfo.common) === null || _extraInfo$common === void 0 ? void 0 : _extraInfo$common.disabled),
         type: processColumnType(it, extraInfo),
         enum: it.type === 'enum' ? processEnumData(it, extraInfo) : undefined
       };
@@ -228,11 +279,7 @@ var TableArray = function TableArray(props) {
   }, [schema, processSchemaToColumns]);
 
   var onTableChange = function onTableChange(values) {
-    form.setFieldsValue(_objectSpread({}, _defineProperty({}, "".concat(name), values)));
-    formContext.stream$.next({
-      type: 'onValuesChange',
-      payload: _defineProperty({}, "".concat(name), _objectSpread({}, values))
-    });
+    listRef.current = values;
   };
 
   var onButtonCellClick = function onButtonCellClick(record) {
@@ -272,7 +319,7 @@ var TableArray = function TableArray(props) {
     tableProps: {
       scroll: {
         x: '100%',
-        y: "".concat(rowNumber * getCellHeight(readonly) + 45, "px")
+        y: addButtonHidden || readonly ? "".concat(rowNumber * getCellHeight(readonly) + 45, "px ") : "".concat(rowNumber * getCellHeight(readonly), "px ")
       }
     }
   })));

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

@@ -13,3 +13,4 @@ export declare function getDataCell(item: any, options: IFormOptions): JSX.Eleme
  */
 export declare function renderForm(schemaRef: any[], options: IFormOptions, colSpan?: number): JSX.Element;
 export declare function getLabelByProps(data: any): any;
+export declare function assign(pathArr: string[], val: any, obj: any): void;

package/es/comps/MetadataForm/utils.js

@@ -9,7 +9,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-09 15:53:44
+ * @LastEditTime: 2023-02-10 17:03:48
  */
 import React from 'react';
 import Input from './DataCell/Input';
@@ -104,4 +104,16 @@ export function getLabelByProps(data) {
   }
 
   return data.id;
+}
+export function assign(pathArr, val, obj) {
+  var len = pathArr.length - 1;
+  pathArr.reduce(function (cur, key, index) {
+    if (index === len) {
+      cur[key] = val;
+    } else {
+      cur[key] = {};
+    }
+
+    return cur[key];
+  }, obj);
 }

package/es/utils.d.ts

@@ -14,3 +14,6 @@ export declare function useThrottle(fn: Function, delay: number, dep?: Dependenc
 export declare function deepClone<T = any>(target: T): T;
 export declare function guid(): string;
 export declare const md5: (data: string, digest?: string) => any;
+export declare function arrayMoveMutable(array: any[], fromIndex: number, toIndex: number): void;
+export declare function arrayMoveImmutable(array: any[], fromIndex: number, toIndex: number): any[];
+export declare function arrayInsert(array: any[], index: number, item: any): any[];

package/es/utils.js

@@ -1,7 +1,10 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-08-11 09:42:43
+ * @LastEditTime: 2023-02-13 17:02:22
  */
 import { useCallback, useEffect, useRef } from 'react';
 /** 防抖 */
@@ -109,4 +112,27 @@ var crypto = require('crypto');
 export var md5 = function md5(data) {
   var digest = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'hex';
   return crypto.createHash('md5').update(data).digest(digest || 'base64');
-};
+};
+export function arrayMoveMutable(array, fromIndex, toIndex) {
+  var startIndex = fromIndex < 0 ? array.length + fromIndex : fromIndex;
+
+  if (startIndex >= 0 && startIndex < array.length) {
+    var endIndex = toIndex < 0 ? array.length + toIndex : toIndex;
+
+    var _array$splice = array.splice(fromIndex, 1),
+        _array$splice2 = _slicedToArray(_array$splice, 1),
+        item = _array$splice2[0];
+
+    array.splice(endIndex, 0, item);
+  }
+}
+export function arrayMoveImmutable(array, fromIndex, toIndex) {
+  var newArray = _toConsumableArray(array);
+
+  arrayMoveMutable(newArray, fromIndex, toIndex);
+  return newArray;
+}
+export function arrayInsert(array, index, item) {
+  array.splice(index, 0, item);
+  return array;
+}

package/package.json

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