ronds-metadata 1.2.37 → 1.2.38

package/es/comps/MetadataEdit/index.less

@@ -1,10 +1,10 @@
-.metadata-edit {
-  height: 100%;
-  width: 100%;
-  .ant-row {
-    display: block;
-  }
-  .pr-10 {
-    padding-right: 10px;
-  }
-}
+.metadata-edit {
+  height: 100%;
+  width: 100%;
+  .ant-row {
+    display: block;
+  }
+  .pr-10 {
+    padding-right: 10px;
+  }
+}

package/es/comps/MetadataEdit/type.d.ts

@@ -1,20 +1,20 @@
-export interface IMetaFileds {
-  id: string;
-  type: 'object';
-  properties: any[];
-  value: any;
-}
-
-export type ITypeStatus = 'object' | 'ref' | 'bool' | 'number' | 'text' | 'enum' | 'array';
-
-export type IMetaProperty = {
-  /**
-   * 属性的名称
-   */
-  id: string;
-  /**
-   * 类型
-   */
-  type: string;
-  enum?: any[];
-};
+export interface IMetaFileds {
+  id: string;
+  type: 'object';
+  properties: any[];
+  value: any;
+}
+
+export type ITypeStatus = 'object' | 'ref' | 'bool' | 'number' | 'text' | 'enum' | 'array';
+
+export type IMetaProperty = {
+  /**
+   * 属性的名称
+   */
+  id: string;
+  /**
+   * 类型
+   */
+  type: string;
+  enum?: any[];
+};

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

@@ -17,7 +17,7 @@ import _Input from "antd/es/input";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-04-04 09:20:39
+ * @LastEditTime: 2023-04-27 18:56:50
  */
 import React from 'react';
 import { UploadOutlined } from '@ant-design/icons';
@@ -91,12 +91,16 @@ function Index(props) {
         });
 
       case 'datePicker':
-        return /*#__PURE__*/React.createElement(_DatePicker, {
-          showTime: true,
-          format: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.format) || DEFAULT_DATE_FORMAT,
-          disabled: (_extraInfo$disabled4 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled4 !== void 0 ? _extraInfo$disabled4 : disabled,
-          placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder
-        });
+        return (
+          /*#__PURE__*/
+          // @ts-ignore
+          React.createElement(_DatePicker, {
+            showTime: true,
+            format: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.format) || DEFAULT_DATE_FORMAT,
+            disabled: (_extraInfo$disabled4 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled4 !== void 0 ? _extraInfo$disabled4 : disabled,
+            placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder
+          })
+        );
 
       case 'upload':
         return /*#__PURE__*/React.createElement(_Upload, null, /*#__PURE__*/React.createElement(_Button, {

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

@@ -38,7 +38,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-04-03 15:47:01
+ * @LastEditTime: 2023-04-28 10:25:33
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -48,7 +48,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';
+import { assignReplace } from '../utils';
 
 function Index(props) {
   var _extraInfo$http8, _extraInfo$http9, _extraInfo$http10, _extraInfo$http11, _extraInfo$http12, _extraInfo$http13;
@@ -142,7 +142,7 @@ function Index(props) {
           if (_changeData && !(p === null || p === void 0 ? void 0 : (_p$payload = p.payload) === null || _p$payload === void 0 ? void 0 : _p$payload.trigger)) {
             setTimeout(function () {
               var v = {};
-              assign(name, undefined, v);
+              assignReplace(name, undefined, v);
               formContext.form.setFieldsValue(_objectSpread({}, v));
             }, 100);
           }
@@ -176,7 +176,7 @@ function Index(props) {
             setWatchValue(_objectSpread({}, watchValueRef.current));
             setTimeout(function () {
               var v = {};
-              assign(name, undefined, v);
+              assignReplace(name, undefined, v);
               formContext.form.setFieldsValue(_objectSpread({}, v));
             }, 100);
           }

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

@@ -14,7 +14,7 @@ import { JsonMetadataProvider } from '../../../../framework/metadata';
 import Editable from '../../../../comps/Editable';
 import useObservable from '../../../../framework/rxjs-hooks/useObservable';
 import { MetadataFormContext } from '../../interface';
-import { assign, getLabelByProps } from '../../utils';
+import { assignReplace, getLabelByProps } from '../../utils';
 import { deepClone, getConstantValue } from '../../../../utils';
 import { STREAM_EVENT_TYPE } from '../../constants';
 
@@ -104,10 +104,10 @@ var TableArray = function TableArray(props) {
 
         var _allVals = form.getFieldsValue();
 
-        assign(name, _objectSpread({
+        assignReplace(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);
+        assignReplace(name, _toConsumableArray(listRef.current), _allVals);
         formContext.stream$.next({
           type: STREAM_EVENT_TYPE.ON_VALUES_CHANGE,
           payload: {
@@ -377,11 +377,11 @@ var TableArray = function TableArray(props) {
       form.setFieldsValue(_objectSpread({}, _defineProperty({}, "".concat(name), values)));
     } else {
       var val = {};
-      assign(name, _toConsumableArray(values), val);
+      assignReplace(name, _toConsumableArray(values), val);
 
       var _allVals2 = form.getFieldsValue();
 
-      assign(name, _toConsumableArray(values), _allVals2);
+      assignReplace(name, _toConsumableArray(values), _allVals2);
       formContext.stream$.next({
         type: STREAM_EVENT_TYPE.ON_VALUES_CHANGE,
         payload: {

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

@@ -1,41 +1,41 @@
-.with-add-on-after {
-  --card-bg: #ffffff;
-  position: relative;
-  width: 100%;
-
-  .ant-form-item-label {
-    padding: 0 !important;
-  }
-
-  & > .ant-form-item {
-    padding: 0 0 8px !important;
-    flex: 1;
-  }
-  &-extra {
-    position: absolute;
-    right: 20px;
-    top: 18px;
-    padding: 0 6px;
-    background-color: var(--card-bg);
-    z-index: 1000;
-  }
-  &-ref {
-    position: absolute;
-    right: 20px;
-    top: -10px;
-    padding: 0 6px;
-    background-color: var(--card-bg);
-    z-index: 1000;
-  }
-  .ant-select-tree-indent {
-    .ant-select-tree-indent-unit {
-      width: 10px !important;
-    }
-  }
-
-  /*   .ant-col-2.7 {
-    display: block;
-    flex: 0 0 75%;
-    max-width: 75%;
-  } */
-}
+.with-add-on-after {
+  --card-bg: #ffffff;
+  position: relative;
+  width: 100%;
+
+  .ant-form-item-label {
+    padding: 0 !important;
+  }
+
+  & > .ant-form-item {
+    padding: 0 0 8px !important;
+    flex: 1;
+  }
+  &-extra {
+    position: absolute;
+    right: 20px;
+    top: 18px;
+    padding: 0 6px;
+    background-color: var(--card-bg);
+    z-index: 1000;
+  }
+  &-ref {
+    position: absolute;
+    right: 20px;
+    top: -10px;
+    padding: 0 6px;
+    background-color: var(--card-bg);
+    z-index: 1000;
+  }
+  .ant-select-tree-indent {
+    .ant-select-tree-indent-unit {
+      width: 10px !important;
+    }
+  }
+
+  /*   .ant-col-2.7 {
+    display: block;
+    flex: 0 0 75%;
+    max-width: 75%;
+  } */
+}

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

@@ -14,3 +14,4 @@ export declare function getDataCell(item: any, options: IFormOptions, colSpan: n
 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;
+export declare function assignReplace(pathArr: string[], val: any, obj: any): void;

package/es/comps/MetadataForm/utils.js

@@ -7,7 +7,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-04-24 11:25:12
+ * @LastEditTime: 2023-04-28 10:22:47
  */
 import React from 'react';
 import Input from './DataCell/Input';
@@ -113,6 +113,18 @@ export function assign(pathArr, val, obj) {
       }
     }
 
+    return cur[key];
+  }, obj);
+}
+export function assignReplace(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/comps/Split/index.js

@@ -31,22 +31,26 @@ var Index = function Index(props) {
       onDrag = props.onDrag,
       onDragStart = props.onDragStart,
       onDragEnd = props.onDragEnd;
-  return /*#__PURE__*/React.createElement(Split, {
-    className: classNames('split-panel', className),
-    dragInterval: dragInterval,
-    gutterSize: gutterSize,
-    sizes: sizes,
-    minSize: minSize,
-    direction: direction,
-    style: style,
-    cursor: cursor,
-    gutter: gutter,
-    elementStyle: elementStyle,
-    gutterStyle: gutterStyle,
-    onDrag: onDrag,
-    onDragStart: onDragStart,
-    onDragEnd: onDragEnd
-  }, children);
+  return (
+    /*#__PURE__*/
+    // @ts-ignore
+    React.createElement(Split, {
+      className: classNames('split-panel', className),
+      dragInterval: dragInterval,
+      gutterSize: gutterSize,
+      sizes: sizes,
+      minSize: minSize,
+      direction: direction,
+      style: style,
+      cursor: cursor,
+      gutter: gutter,
+      elementStyle: elementStyle,
+      gutterStyle: gutterStyle,
+      onDrag: onDrag,
+      onDragStart: onDragStart,
+      onDragEnd: onDragEnd
+    }, children)
+  );
 };
 
 export default Index;

package/es/framework/metadata/types.d.ts

@@ -1,98 +1,98 @@
-/*
- * @Author: wangxian
- * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-09 18:37:15
- */
-export type IMetaType = 'object' | 'ref' | 'bool' | 'number' | 'text' | 'enum' | 'array' | string;
-
-export type IMetaData = {
-  /**
-   * 类名称/属性名称
-   */
-  id: string;
-  /**
-   * 类型
-   */
-  type: IMetaType;
-  /**
-   * 属性
-   */
-  properties?: IMetaProperties[];
-
-  /**
-   * 引用id
-   */
-  refId?: string;
-  /**
-   * 静态的变量
-   */
-  fields?: IMetaFileds[];
-  /**
-   * 内部类
-   */
-  types?: IMetaData[];
-};
-
-export type IMetaProperties = {
-  /**
-   * 类规则名称
-   */
-  id: string;
-
-  /**
-   * 类型
-   */
-  type: IMetaType;
-
-  /**
-   * 引用id
-   */
-  refId?: string;
-  /**
-   * 静态的变量
-   */
-  fields?: IMetaFileds[];
-  /**
-   * 枚举值
-   */
-  enum?: { value: string }[];
-  /**
-   * 数组类型
-   */
-  items?: { type: IMetaType; refId?: string };
-};
-
-export type IMetaFileds = {
-  /**
-   * 规则名称
-   */
-  id: string;
-
-  /**
-   * 类型
-   */
-  type: IMetaType;
-
-  /**
-   * 引用id
-   */
-  refId?: string;
-
-  /**
-   * 规则值
-   */
-  value: any;
-};
-
-export interface IAPI {
-  // 获取元数据列表
-  GetMetadataList(keyWords?: string[]): Promise<{ id: string; name: string; schema: string }[]>;
-  // 通过元数据Id获取元数据详情
-  GetMetadataDetailById(metadataId: string): Promise<any>;
-  // 新增元数据
-  SaveMetadata(data: any, metadataTag: string): Promise<any>;
-  // 获取元数据的值
-  GetMetadataObjList(data: any): Promise<any[]>;
-  /** 通过扩展规则获取枚举类型的值 */
-  GetEnumDataByUrl(url: string, method: 'get' | 'post', body: any): Promise<any>;
-}
+/*
+ * @Author: wangxian
+ * @Date: 2021-09-18 14:15:04
+ * @LastEditTime: 2023-02-09 18:37:15
+ */
+export type IMetaType = 'object' | 'ref' | 'bool' | 'number' | 'text' | 'enum' | 'array' | string;
+
+export type IMetaData = {
+  /**
+   * 类名称/属性名称
+   */
+  id: string;
+  /**
+   * 类型
+   */
+  type: IMetaType;
+  /**
+   * 属性
+   */
+  properties?: IMetaProperties[];
+
+  /**
+   * 引用id
+   */
+  refId?: string;
+  /**
+   * 静态的变量
+   */
+  fields?: IMetaFileds[];
+  /**
+   * 内部类
+   */
+  types?: IMetaData[];
+};
+
+export type IMetaProperties = {
+  /**
+   * 类规则名称
+   */
+  id: string;
+
+  /**
+   * 类型
+   */
+  type: IMetaType;
+
+  /**
+   * 引用id
+   */
+  refId?: string;
+  /**
+   * 静态的变量
+   */
+  fields?: IMetaFileds[];
+  /**
+   * 枚举值
+   */
+  enum?: { value: string }[];
+  /**
+   * 数组类型
+   */
+  items?: { type: IMetaType; refId?: string };
+};
+
+export type IMetaFileds = {
+  /**
+   * 规则名称
+   */
+  id: string;
+
+  /**
+   * 类型
+   */
+  type: IMetaType;
+
+  /**
+   * 引用id
+   */
+  refId?: string;
+
+  /**
+   * 规则值
+   */
+  value: any;
+};
+
+export interface IAPI {
+  // 获取元数据列表
+  GetMetadataList(keyWords?: string[]): Promise<{ id: string; name: string; schema: string }[]>;
+  // 通过元数据Id获取元数据详情
+  GetMetadataDetailById(metadataId: string): Promise<any>;
+  // 新增元数据
+  SaveMetadata(data: any, metadataTag: string): Promise<any>;
+  // 获取元数据的值
+  GetMetadataObjList(data: any): Promise<any[]>;
+  /** 通过扩展规则获取枚举类型的值 */
+  GetEnumDataByUrl(url: string, method: 'get' | 'post', body: any): Promise<any>;
+}