ronds-metadata 1.2.14 → 1.2.16

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/Select.js

@@ -32,7 +32,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-28 10:19:57
+ * @LastEditTime: 2023-03-06 14:43:01
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -198,7 +198,7 @@ function Index(props) {
               totalRef.current = res === null || res === void 0 ? void 0 : res.total;
 
               if (!(_res && _res.length > 0)) {
-                _context.next = 15;
+                _context.next = 17;
                 break;
               }
 
@@ -210,6 +210,14 @@ function Index(props) {
               return _context.abrupt("return", _res);
 
             case 12:
+              if (!(http === null || http === void 0 ? void 0 : http.isGroup)) {
+                _context.next = 14;
+                break;
+              }
+
+              return _context.abrupt("return", _res);
+
+            case 14:
               return _context.abrupt("return", _res.map(function (it) {
                 if (http === null || http === void 0 ? void 0 : http.isCascader) {
                   return {
@@ -226,11 +234,11 @@ function Index(props) {
                 }
               }));
 
-            case 15:
+            case 17:
               console.warn("".concat(_url, " is not return success result"));
               return _context.abrupt("return", []);
 
-            case 17:
+            case 19:
             case "end":
               return _context.stop();
           }
@@ -481,7 +489,9 @@ function Index(props) {
         },
         allowClear: true,
         onChange: onSelectChange,
-        maxTagCount: "responsive"
+        maxTagCount: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.maxTagCount,
+        maxTagTextLength: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.maxTagTextLength) || 9,
+        maxTagPlaceholder: "..."
       });
     }
   };

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

@@ -22,7 +22,7 @@ export function withAddOnAfter(WrappedComponent) {
         name = _props$name === void 0 ? [] : _props$name,
         isObj = props.isObj;
     var formContext = React.useContext(MetadataFormContext) || {};
-    var depend = useWatchDepend(fields && ((_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 === null || formContext === void 0 ? void 0 : formContext.stream$);
+    var depend = useWatchDepend(fields && ((_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 === null || formContext === void 0 ? void 0 : formContext.stream$, name);
 
     var _React$useState = React.useState(),
         _React$useState2 = _slicedToArray(_React$useState, 2),

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

@@ -1,35 +1,35 @@
-.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-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-col-2.7 {
+    display: block;
+    flex: 0 0 75%;
+    max-width: 75%;
+  } */
+}

package/es/comps/MetadataForm/hooks/index.d.ts

@@ -1,3 +1,3 @@
 import { IFiledDepend } from '../interface';
 export declare const useGetExtraInfo: (fields: any, id: string, form: any, type: string) => any;
-export declare const useWatchDepend: (_depends: IFiledDepend, stream$: any) => any;
+export declare const useWatchDepend: (_depends: IFiledDepend, stream$: any, name: string[]) => any;

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-28 11:03:50
+ * @LastEditTime: 2023-02-28 15:38:07
  */
 import { getLocale } from '../../../framework/locale';
 import moment from 'moment';
@@ -57,7 +57,7 @@ export var useGetExtraInfo = function useGetExtraInfo(fields, id, form, type) {
   return extra;
 }; // 处理depend联动
 
-export var useWatchDepend = function useWatchDepend(_depends, stream$) {
+export var useWatchDepend = function useWatchDepend(_depends, stream$, name) {
   var _React$useState3 = React.useState({}),
       _React$useState4 = _slicedToArray(_React$useState3, 2),
       depends = _React$useState4[0],
@@ -71,7 +71,7 @@ export var useWatchDepend = function useWatchDepend(_depends, stream$) {
           if (_depends === null || _depends === void 0 ? void 0 : _depends.hidden) {
             var _p$payload;
 
-            var _hidden = processDependHiddenOrShow(_depends === null || _depends === void 0 ? void 0 : _depends.hidden, p === null || p === void 0 ? void 0 : (_p$payload = p.payload) === null || _p$payload === void 0 ? void 0 : _p$payload.allVals, stream$);
+            var _hidden = processDependHiddenOrShow(_depends === null || _depends === void 0 ? void 0 : _depends.hidden, p === null || p === void 0 ? void 0 : (_p$payload = p.payload) === null || _p$payload === void 0 ? void 0 : _p$payload.allVals, stream$, name);
 
             var _dr = dependsRef.current;
             _dr.hidden = _hidden;
@@ -82,7 +82,7 @@ export var useWatchDepend = function useWatchDepend(_depends, stream$) {
           if (_depends === null || _depends === void 0 ? void 0 : _depends.show) {
             var _p$payload2;
 
-            var _show = processDependHiddenOrShow(_depends === null || _depends === void 0 ? void 0 : _depends.show, p === null || p === void 0 ? void 0 : (_p$payload2 = p.payload) === null || _p$payload2 === void 0 ? void 0 : _p$payload2.allVals, stream$);
+            var _show = processDependHiddenOrShow(_depends === null || _depends === void 0 ? void 0 : _depends.show, p === null || p === void 0 ? void 0 : (_p$payload2 = p.payload) === null || _p$payload2 === void 0 ? void 0 : _p$payload2.allVals, stream$, name);
 
             var _dr2 = dependsRef.current;
             _dr2.show = _show;
@@ -93,7 +93,7 @@ export var useWatchDepend = function useWatchDepend(_depends, stream$) {
           if (_depends === null || _depends === void 0 ? void 0 : _depends.notRequire) {
             var _p$payload3;
 
-            var _show2 = processDependHiddenOrShow(_depends === null || _depends === void 0 ? void 0 : _depends.notRequire, p === null || p === void 0 ? void 0 : (_p$payload3 = p.payload) === null || _p$payload3 === void 0 ? void 0 : _p$payload3.allVals, stream$);
+            var _show2 = processDependHiddenOrShow(_depends === null || _depends === void 0 ? void 0 : _depends.notRequire, p === null || p === void 0 ? void 0 : (_p$payload3 = p.payload) === null || _p$payload3 === void 0 ? void 0 : _p$payload3.allVals, stream$, name);
 
             var _dr3 = dependsRef.current;
             _dr3.notRequire = _show2;
@@ -107,7 +107,7 @@ export var useWatchDepend = function useWatchDepend(_depends, stream$) {
   return depends;
 };
 
-var processDependHiddenOrShow = function processDependHiddenOrShow(depend, changeData, stream$) {
+var processDependHiddenOrShow = function processDependHiddenOrShow(depend, changeData, stream$, name) {
   try {
     // const regex = /\w+(\.\w+)?[=<>!]{1}/g;
     var regex = /\w+(\.\w+)?[=<>!]{1}|\w+(\.\w+)?(\.indexOf\('.+'\)[=<>!]{1})/g;
@@ -124,8 +124,16 @@ var processDependHiddenOrShow = function processDependHiddenOrShow(depend, chang
 
       var _key = key.split('.');
 
-      if (changeData[_key[0]] || changeData[_key[0]] === 0) {
-        var r = key === _key[0] ? "'".concat(changeData[_key[0]], "'") : eval("changeData[_key[0]].".concat(_key[1]));
+      var evalString = 'changeData';
+
+      for (var _i = 0; _i < name.length; _i++) {
+        evalString = "".concat(evalString, "[name[").concat(_i, "]]");
+      }
+
+      var _changeData = eval("".concat(evalString, "['").concat(_key[0], "']"));
+
+      if (_changeData || _changeData === 0) {
+        var r = key === _key[0] ? "'".concat(_changeData, "'") : eval("_changeData.".concat(_key[1]));
         expression = expression.replace(key, r);
       } else {
         expression = expression.replace(key, undefined);

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>;
+}

package/es/theme.less

@@ -1,77 +1,77 @@
-.ronds-metadata-dark {
-  --ronds-metadata-color-border-1: #314162;
-  --ronds-metadata-color-border-2: #0d9af3;
-  --ronds-metadata-color-bg-2: #0d1f40;
-  --ronds-metadata-color-bg-3: #0d1f40;
-  --ronds-metadata-color-bg-4: #1c3771;
-  --ronds-metadata-color-text-1: #ffffff;
-  --ronds-metadata-color-text-2: #ffffff;
-  --ronds-metadata-color-text-3: #ffffff;
-
-  ::-webkit-scrollbar {
-    width: 6px;
-    height: 6px;
-    overflow: auto;
-  }
-  ::-webkit-scrollbar-corner {
-    background-color: transparent;
-    color: transparent;
-  }
-
-  ::-webkit-scrollbar-thumb {
-    box-shadow: inset 0 0 5px var(--scrollbar-bg-color);
-    background: var(--scrollbar-color);
-    min-height: 25px;
-    min-width: 25px;
-    border-radius: 3px;
-
-    &:hover {
-      border-radius: 2px;
-      // box-shadow: inset 0 0 5px var(--scrollbar-color-hover);
-      background: var(--scrollbar-color-hover);
-    }
-
-    &:active {
-      // box-shadow: inset 0 0 5px var(--scrollbar-bg-color);
-      background: var(--scrollbar-color-hover);
-    }
-  }
-}
-
-.ronds-metadata-normal {
-  --ronds-metadata-color-border-1: #d9d9d9;
-  --ronds-metadata-color-border-2: #165dff;
-  --ronds-metadata-color-bg-2: rgba(229, 238, 255, 0.85);
-  --ronds-metadata-color-bg-3: #f6f5f6;
-  --ronds-metadata-color-bg-4: #ffffff;
-  --ronds-metadata-color-text-1: #1d2129;
-  --ronds-metadata-color-text-2: #24292f;
-  --ronds-metadata-color-text-3: #f2f3f5;
-
-  ::-webkit-scrollbar {
-    width: 6px;
-    height: 6px;
-    overflow: auto;
-  }
-
-  ::-webkit-scrollbar-thumb {
-    background-color: var(--scrollbar-color);
-    min-height: 25px;
-    min-width: 25px;
-    border-radius: 3px;
-
-    &:hover {
-      background-color: #a8a8a8;
-    }
-
-    &:active {
-      background-color: #787878;
-    }
-
-    /* border: 1px solid #e0e0e0; */
-  }
-
-  ::-webkit-scrollbar-track {
-    background-color: #f7f7f7;
-  }
-}
+.ronds-metadata-dark {
+  --ronds-metadata-color-border-1: #314162;
+  --ronds-metadata-color-border-2: #0d9af3;
+  --ronds-metadata-color-bg-2: #0d1f40;
+  --ronds-metadata-color-bg-3: #0d1f40;
+  --ronds-metadata-color-bg-4: #1c3771;
+  --ronds-metadata-color-text-1: #ffffff;
+  --ronds-metadata-color-text-2: #ffffff;
+  --ronds-metadata-color-text-3: #ffffff;
+
+  ::-webkit-scrollbar {
+    width: 6px;
+    height: 6px;
+    overflow: auto;
+  }
+  ::-webkit-scrollbar-corner {
+    background-color: transparent;
+    color: transparent;
+  }
+
+  ::-webkit-scrollbar-thumb {
+    box-shadow: inset 0 0 5px var(--scrollbar-bg-color);
+    background: var(--scrollbar-color);
+    min-height: 25px;
+    min-width: 25px;
+    border-radius: 3px;
+
+    &:hover {
+      border-radius: 2px;
+      // box-shadow: inset 0 0 5px var(--scrollbar-color-hover);
+      background: var(--scrollbar-color-hover);
+    }
+
+    &:active {
+      // box-shadow: inset 0 0 5px var(--scrollbar-bg-color);
+      background: var(--scrollbar-color-hover);
+    }
+  }
+}
+
+.ronds-metadata-normal {
+  --ronds-metadata-color-border-1: #d9d9d9;
+  --ronds-metadata-color-border-2: #165dff;
+  --ronds-metadata-color-bg-2: rgba(229, 238, 255, 0.85);
+  --ronds-metadata-color-bg-3: #f6f5f6;
+  --ronds-metadata-color-bg-4: #ffffff;
+  --ronds-metadata-color-text-1: #1d2129;
+  --ronds-metadata-color-text-2: #24292f;
+  --ronds-metadata-color-text-3: #f2f3f5;
+
+  ::-webkit-scrollbar {
+    width: 6px;
+    height: 6px;
+    overflow: auto;
+  }
+
+  ::-webkit-scrollbar-thumb {
+    background-color: var(--scrollbar-color);
+    min-height: 25px;
+    min-width: 25px;
+    border-radius: 3px;
+
+    &:hover {
+      background-color: #a8a8a8;
+    }
+
+    &:active {
+      background-color: #787878;
+    }
+
+    /* border: 1px solid #e0e0e0; */
+  }
+
+  ::-webkit-scrollbar-track {
+    background-color: #f7f7f7;
+  }
+}