ronds-metadata 1.2.18 → 1.2.19

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

@@ -84,7 +84,10 @@ function Index(props) {
       background: '#fff'
     }
   }, help || (items === null || items === void 0 ? void 0 : items.type)))), /*#__PURE__*/React.createElement(_Col, {
-    flex: labelSpan && (formContext === null || formContext === void 0 ? void 0 : formContext.layout) === 'horizontal' ? "0 0 ".concat((24 - labelSpan) * 100 / 24, "%") : 1
+    flex: labelSpan && (formContext === null || formContext === void 0 ? void 0 : formContext.layout) === 'horizontal' ? "0 0 ".concat((24 - labelSpan) * 100 / 24, "%") : 1,
+    style: {
+      width: "".concat((24 - labelSpan) * 100 / 24, "%")
+    }
   }, extraInfo.layout === 'table' && items.type === 'ref' ? /*#__PURE__*/React.createElement(TableArray, {
     initValue: formContext.initialValues,
     initEnumValue: initEnumValue,

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

@@ -34,7 +34,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-03-07 08:29:13
+ * @LastEditTime: 2023-03-07 15:10:14
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -452,8 +452,8 @@ function Index(props) {
         treeData: treeData,
         allowClear: true,
         disabled: (_extraInfo$disabled2 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled2 !== void 0 ? _extraInfo$disabled2 : disabled,
-        placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder,
-        treeDefaultExpandAll: true,
+        placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder // treeDefaultExpandAll
+        ,
         maxTagCount: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.maxTagCount,
         maxTagTextLength: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.maxTagTextLength,
         maxTagPlaceholder: "..."

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

@@ -204,8 +204,54 @@ var TableArray = function TableArray(props) {
       firstLoadRef.current = false;
     }
   }, [initValue, form]);
+  var getEnumDataByUrl = React.useCallback( /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(http) {
+      var server, _url, res, _res;
+
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              server = new MetadataService();
+              _url = http.url;
+              _context2.next = 4;
+              return server.GetEnumDataByUrl(_url, http.method, (http === null || http === void 0 ? void 0 : http.body) && JSON.parse(http === null || http === void 0 ? void 0 : http.body));
+
+            case 4:
+              res = _context2.sent;
+              _res = (res === null || res === void 0 ? void 0 : res.total) ? res === null || res === void 0 ? void 0 : res.list : res;
+
+              if (!(_res && _res.length > 0)) {
+                _context2.next = 10;
+                break;
+              }
+
+              return _context2.abrupt("return", _res.map(function (it) {
+                return {
+                  value: it[(http === null || http === void 0 ? void 0 : http.key) || 'id'],
+                  label: it[(http === null || http === void 0 ? void 0 : http.value) || 'name'],
+                  disabled: false
+                };
+              }));
+
+            case 10:
+              console.warn("".concat(_url, " is not return success result"));
+              return _context2.abrupt("return", []);
+
+            case 12:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }));
+
+    return function (_x3) {
+      return _ref2.apply(this, arguments);
+    };
+  }(), []);
   var processEnumData = React.useCallback(function (data, _extraInfo) {
-    var _extraInfo$enum;
+    var _extraInfo$enum, _extraInfo$enum3;
 
     var _options = [];
 
@@ -216,6 +262,13 @@ var TableArray = function TableArray(props) {
       var _extraInfo$enum2;
 
       _enum = deepClone(_extraInfo === null || _extraInfo === void 0 ? void 0 : (_extraInfo$enum2 = _extraInfo.enum) === null || _extraInfo$enum2 === void 0 ? void 0 : _extraInfo$enum2.value);
+    } // 从接口拿数据
+
+
+    if (_extraInfo === null || _extraInfo === void 0 ? void 0 : (_extraInfo$enum3 = _extraInfo.enum) === null || _extraInfo$enum3 === void 0 ? void 0 : _extraInfo$enum3.http) {
+      var _extraInfo$enum4;
+
+      return getEnumDataByUrl(deepClone(_extraInfo === null || _extraInfo === void 0 ? void 0 : (_extraInfo$enum4 = _extraInfo.enum) === null || _extraInfo$enum4 === void 0 ? void 0 : _extraInfo$enum4.http));
     } // 目前是更具那么的id判断的，暂未考虑重名问题
 
 
@@ -249,7 +302,7 @@ var TableArray = function TableArray(props) {
     var _columns = [];
 
     for (var i = 0; i < _properties.length; i++) {
-      var _extraInfo$common;
+      var _extraInfo$common, _extraInfo$enum5;
 
       var it = _properties[i];
       var extraInfo = refFieldsRef.current.get(it.id);
@@ -260,7 +313,8 @@ var TableArray = function TableArray(props) {
         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
+        enum: it.type === 'enum' ? processEnumData(it, extraInfo) : undefined,
+        mode: (extraInfo === null || extraInfo === void 0 ? void 0 : (_extraInfo$enum5 = extraInfo.enum) === null || _extraInfo$enum5 === void 0 ? void 0 : _extraInfo$enum5.isMutiple) ? 'multiple' : undefined
       };
 
       _columns.push(obj);

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

@@ -1,35 +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-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/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;
+  }
+}