ronds-metadata 1.0.49 → 1.0.52

package/es/api/index.d.ts

@@ -14,5 +14,5 @@ export default class Api implements IAPI {
     GetMetadataDetailById(metadataId: string): Promise<any>;
     /** 添加元数据 */
     SaveMetadata(data: any, metadataTag: string): Promise<any>;
-    GetMetadataObjList(data: any): Promise<any[]>;
+    GetMetadataObjList(data: any): Promise<any>;
 }

package/es/api/index.js

@@ -2,6 +2,12 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
+
+/*
+ * @Author:wangxian
+ * @Date: 2021-09-18 14:15:04
+ * @LastEditTime: 2022-03-28 15:33:19
+ */
 import { HttpHelper } from '../framework/http';
 var http = new HttpHelper();
 
@@ -20,6 +26,8 @@ var Api = /*#__PURE__*/function () {
      */
     function () {
       var _GetMetadataList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(keyWords) {
+        var _res$data;
+
         var param, url, res;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
@@ -42,7 +50,7 @@ var Api = /*#__PURE__*/function () {
 
               case 4:
                 res = _context.sent;
-                return _context.abrupt("return", res.data);
+                return _context.abrupt("return", (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list);
 
               case 6:
               case "end":
@@ -139,13 +147,20 @@ var Api = /*#__PURE__*/function () {
     key: "GetMetadataObjList",
     value: function () {
       var _GetMetadataObjList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(data) {
+        var url, res;
         return _regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
-                return _context4.abrupt("return", []);
+                url = "/dataset-web/source/{namespace}/entity/page".replace('{namespace}', data.id);
+                _context4.next = 3;
+                return http.post(encodeURI(url), data);
 
-              case 1:
+              case 3:
+                res = _context4.sent;
+                return _context4.abrupt("return", res.successed ? res.data : []);
+
+              case 5:
               case "end":
                 return _context4.stop();
             }

package/es/comps/Editable/comps/EditableCell.js

@@ -50,14 +50,6 @@ var EditableCell = function EditableCell(props) {
           rowIndex: undefined
         }
       });
-      editableStream.next({
-        type: 'onValuesChange',
-        payload: {
-          rowIdx: record === null || record === void 0 ? void 0 : record._rowKey_,
-          values: {},
-          allValues: record
-        }
-      });
     }
 
     if (isAddColumn) {

package/es/comps/Editable/comps/EditableHeardCell.js

@@ -115,7 +115,7 @@ var EditableHeardCell = function EditableHeardCell(props) {
   };
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("th", _extends({}, restProps, {
-    className: "ant-table-cell ".concat(isAddColumn && editConfig.editHeardCellKey === dataIndex ? 'border-right ' : '', " ")
+    className: "ant-table-cell font-bold ".concat(isAddColumn && editConfig.editHeardCellKey === dataIndex ? 'border-right ' : '', " ")
   }), isAddColumn && /*#__PURE__*/React.createElement(_Popover, {
     placement: "rightTop",
     content: content,

package/es/comps/Editable/comps/index.css

@@ -17,3 +17,6 @@
 .border-top {
   border-top: 1px solid var(--antd-wave-shadow-color) !important;
 }
+.font-bold {
+  font-weight: bold;
+}

package/es/comps/Editable/index.js

@@ -3,13 +3,12 @@ import _Button from "antd/es/button";
 import "antd/es/table/style";
 import _Table from "antd/es/table";
 import _extends from "@babel/runtime/helpers/esm/extends";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/message/style";
 import _message from "antd/es/message";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React from 'react';
-import { BehaviorSubject } from 'rxjs';
 import { pick, isArray } from 'lodash';
 import EditableCell from './comps/EditableCell';
 import EditableRow from './comps/EditableRow';
@@ -17,6 +16,8 @@ import { EditableContext } from './interface';
 import EditableAction from './comps/EditableAction';
 import { isFreeEditRow, removeCurKeyFromEditRow } from './utils';
 import EditableHeardCell from './comps/EditableHeardCell';
+import useMemoSubject from '../../framework/rxjs-hooks/useMemoSubject';
+import useObservable from '../../framework/rxjs-hooks/useObservable';
 
 var Editable = function Editable(props) {
   var _props$type = props.type,
@@ -78,38 +79,7 @@ var Editable = function Editable(props) {
   var lastDataSourceRef = React.useRef();
   var firstLoadRef = React.useRef(true); // 定义处理编辑表格的数据流
 
-  var editableStream = React.useMemo(function () {
-    return new BehaviorSubject(undefined);
-  }, []);
-
-  var processAddColumnsData = function processAddColumnsData(data) {
-    var _columns = addColumnsRef.current.length > 0 ? addColumnsRef.current : columns; // 判断key是否重复
-
-
-    if (_columns.findIndex(function (v) {
-      return v.key === data.key;
-    }) > -1) {
-      _message.warning('表格的key不可以重复');
-
-      return;
-    }
-
-    var idx = _columns.findIndex(function (v) {
-      return v.dataIndex === data.dataIndex;
-    });
-
-    var obj = {
-      title: data.title,
-      key: data.key,
-      dataIndex: data.key
-    };
-
-    _columns.splice(idx + 1, 0, _objectSpread(_objectSpread({}, _columns[0]), obj));
-
-    setAddColumns(_toConsumableArray(_columns));
-    addColumnsRef.current = _columns; // editableStream.next({ type: 'editHeardCellKey', payload: undefined });
-  };
-
+  var editableStream = useMemoSubject();
   var processStreamFactory = React.useCallback(function (data) {
     switch (data === null || data === void 0 ? void 0 : data.type) {
       case 'onValuesChange':
@@ -216,7 +186,38 @@ var Editable = function Editable(props) {
 
         break;
     }
-  }, [type]); // 返回stream的实例
+  }, [type]); // 集中处理数据流
+
+  useObservable(processStreamFactory, [editableStream]);
+
+  var processAddColumnsData = function processAddColumnsData(data) {
+    var _columns = addColumnsRef.current.length > 0 ? addColumnsRef.current : columns; // 判断key是否重复
+
+
+    if (_columns.findIndex(function (v) {
+      return v.key === data.key;
+    }) > -1) {
+      _message.warning('表格的key不可以重复');
+
+      return;
+    }
+
+    var idx = _columns.findIndex(function (v) {
+      return v.dataIndex === data.dataIndex;
+    });
+
+    var obj = {
+      title: data.title,
+      key: data.key,
+      dataIndex: data.key
+    };
+
+    _columns.splice(idx + 1, 0, _objectSpread(_objectSpread({}, _columns[0]), obj));
+
+    setAddColumns(_toConsumableArray(_columns));
+    addColumnsRef.current = _columns; // editableStream.next({ type: 'editHeardCellKey', payload: undefined });
+  }; // 返回stream的实例
+
 
   React.useEffect(function () {
     if (firstLoadRef && editableStream) {
@@ -230,16 +231,7 @@ var Editable = function Editable(props) {
       setRecords(_toConsumableArray(dataSource));
       recordsRef.current = dataSource;
     }
-  }, [dataSource]); // 集中处理数据流
-
-  React.useEffect(function () {
-    var subscription = editableStream.subscribe(function (p) {
-      processStreamFactory(p);
-    });
-    return function () {
-      return subscription.unsubscribe();
-    };
-  }, [editableStream, processStreamFactory]);
+  }, [dataSource]);
   var getEditColumn = React.useCallback(function (column) {
     var _column = _objectSpread(_objectSpread({}, column), {}, {
       children: isArray(column === null || column === void 0 ? void 0 : column.children) ? column.children.map(getEditColumn) : undefined

package/es/comps/MetadataEdit/components/MetaFieldsEdit.js

@@ -174,6 +174,7 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
           required: true
         }]
       }), /*#__PURE__*/React.createElement(_Select, {
+        showSearch: true,
         style: {
           width: '120px'
         },
@@ -187,7 +188,11 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
             fields: newData
           });
         },
-        options: metaType || []
+        options: metaType || [],
+        filterOption: function filterOption(input, option) {
+          return (option === null || option === void 0 ? void 0 : option.label.indexOf(input)) >= 0;
+        },
+        allowClear: true
       })), /*#__PURE__*/React.createElement("div", {
         style: {
           lineHeight: '88px',

package/es/comps/MetadataEdit/components/MetaPropsEdit.js

@@ -165,7 +165,12 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
               style: {
                 width: '180px'
               },
-              options: metaType || []
+              options: metaType || [],
+              showSearch: true,
+              filterOption: function filterOption(input, option) {
+                return (option === null || option === void 0 ? void 0 : option.label.indexOf(input)) >= 0;
+              },
+              allowClear: true
             })), /*#__PURE__*/React.createElement("div", {
               style: {
                 padding: '0 10px'

package/es/comps/MetadataEdit/hooks/index.js

@@ -1,4 +1,10 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+
+/*
+ * @Author: wangxian
+ * @Date: 2021-09-18 14:15:04
+ * @LastEditTime: 2022-03-28 14:30:25
+ */
 import { MetadataService } from './../../../framework/metadata/MetadataService';
 import React from 'react';
 export var useMetaType = function useMetaType(tag) {

package/es/comps/MetadataEditV2/hooks/index.js

@@ -1,12 +1,9 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 
 /*
- * @Author: your name
+ * @Author:wangxian
  * @Date: 2022-03-03 16:12:34
- * @LastEditTime: 2022-03-07 10:55:07
- * @LastEditors: your name
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \MetaData\src\comps\MetadataEditV2\hooks\index.ts
+ * @LastEditTime: 2022-03-28 11:56:36
  */
 import { MetadataService } from './../../../framework/metadata/MetadataService';
 import React from 'react';

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

@@ -9,7 +9,6 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/select/style";
 import _Select from "antd/es/select";
 import React from 'react';
-import { useDebounce } from '../../../utils';
 import { MetadataService } from '../../../framework/metadata/MetadataService';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
 import { useGetExtraInfo } from '../hooks';
@@ -52,54 +51,53 @@ function Index(props) {
       help = _React$useState8[0],
       setHelp = _React$useState8[1];
 
-  var onSearch = useDebounce( /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(value) {
-      var param, server, res, _options, i, obj;
-
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              param = {
-                id: refId,
-                filter: {
-                  keywords: value
-                },
-                order: []
-              };
-              server = new MetadataService();
-              _context.next = 4;
-              return server.GetMetadataObjList(param);
-
-            case 4:
-              res = _context.sent;
-              _options = [];
-
-              if (res.length > 0) {
-                for (i = 0; i < res.length; i++) {
-                  obj = {
-                    label: res[i].name,
-                    value: res[i].namespace
-                  };
-
-                  _options.push(obj);
-                }
+  var onSearch = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    var param, server, res, _options, i, obj;
+
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            param = {
+              id: refId,
+              filter: {
+                keywords: ''
+              },
+              order: []
+            };
+            server = new MetadataService();
+            _context.next = 4;
+            return server.GetMetadataObjList(param);
+
+          case 4:
+            res = _context.sent;
+            _options = [];
+
+            if (res.length > 0) {
+              for (i = 0; i < res.length; i++) {
+                obj = {
+                  label: res[i].name,
+                  value: res[i].namespace
+                };
+
+                _options.push(obj);
               }
+            }
 
-              setOptions(!value ? [] : _options);
+            setOptions(_options);
 
-            case 8:
-            case "end":
-              return _context.stop();
-          }
+          case 8:
+          case "end":
+            return _context.stop();
         }
-      }, _callee);
-    }));
-
-    return function (_x) {
-      return _ref.apply(this, arguments);
-    };
-  }(), 500, []);
+      }
+    }, _callee);
+  })), []);
+  React.useEffect(function () {
+    if (refId) {
+      onSearch();
+    }
+  }, [refId, onSearch]);
   var formOptions = React.useMemo(function () {
     return {
       disabled: disabled,
@@ -185,20 +183,15 @@ function Index(props) {
     tooltip: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.tooltip) || help
   }, /*#__PURE__*/React.createElement(_Select, {
     showSearch: true,
-    allowClear: true,
+    options: options || [],
     placeholder: extraInfo.placeholder,
-    defaultActiveFirstOption: false,
-    showArrow: false,
-    filterOption: false,
-    onSearch: onSearch,
     disabled: (_extraInfo$disabled = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled !== void 0 ? _extraInfo$disabled : disabled,
-    notFoundContent: '没有批到到该实体数据'
-  }, options.map(function (option) {
-    return /*#__PURE__*/React.createElement(Option, {
-      key: option.value,
-      value: option.value
-    }, option.label);
-  }))) : /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
+    notFoundContent: '没有批到到该实体数据',
+    filterOption: function filterOption(input, option) {
+      return (option === null || option === void 0 ? void 0 : option.label.indexOf(input)) >= 0;
+    },
+    allowClear: true
+  })) : /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
     style: {
       flex: 1,
       paddingRight: '10px',
@@ -216,20 +209,15 @@ function Index(props) {
     style: {
       width: '100%'
     },
-    allowClear: true,
+    options: options || [],
     placeholder: extraInfo.placeholder,
-    defaultActiveFirstOption: false,
-    showArrow: false,
-    filterOption: false,
-    onSearch: onSearch,
     disabled: (_extraInfo$disabled2 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled2 !== void 0 ? _extraInfo$disabled2 : disabled,
-    notFoundContent: '没有批到到该实体数据'
-  }, options.map(function (option) {
-    return /*#__PURE__*/React.createElement(Option, {
-      key: option.value,
-      value: option.value
-    }, option.label);
-  })));
+    notFoundContent: '没有批到到该实体数据',
+    filterOption: function filterOption(input, option) {
+      return (option === null || option === void 0 ? void 0 : option.label.indexOf(input)) >= 0;
+    },
+    allowClear: true
+  }));
 }
 
 export default /*#__PURE__*/React.memo(Index);

package/es/framework/http/index.js

@@ -102,10 +102,10 @@ httpClient.interceptors.response.use(function (response) {
     var _response$data2, _response$data3;
 
     // 如果自定义转换
-    if (response.data && response.data.success || response.status === 204) {
+    if (response.data && response.data.success || response.status === 200 || response.status === 204) {
       var _response$data;
 
-      response.data = new BaseResData((_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.data, true, '', response.status);
+      response.data = new BaseResData(((_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.data) || response.data, true, '', response.status);
     } //没有包装的数据
     else if (((_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : _response$data2.data) === undefined && ((_response$data3 = response.data) === null || _response$data3 === void 0 ? void 0 : _response$data3.success) === undefined) {
       response.data = new BaseResData(response.data, true, '', response.status, null, response);

package/es/framework/metadata/MetadataService.js

@@ -2,6 +2,12 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
+
+/*
+ * @Author: wangxian
+ * @Date: 2021-09-18 14:15:04
+ * @LastEditTime: 2022-03-28 11:52:05
+ */
 import Api from '../../api';
 var globalAPI = new Api();
 export var registerMetadataAPI = function registerMetadataAPI(api) {

package/es/framework/rxjs-hooks/useMemoSubject.d.ts

@@ -0,0 +1,3 @@
+import { BehaviorSubject } from 'rxjs';
+declare const useMemoSubject: <T>() => BehaviorSubject<T>;
+export default useMemoSubject;

package/es/framework/rxjs-hooks/useMemoSubject.js

@@ -0,0 +1,16 @@
+/*
+ * @Author: wangxian
+ * @Date: 2022-03-30 10:12:11
+ * @LastEditTime: 2022-03-30 10:39:05
+ */
+import React from 'react';
+import { BehaviorSubject } from 'rxjs';
+
+var useMemoSubject = function useMemoSubject() {
+  var subject$ = React.useMemo(function () {
+    return new BehaviorSubject(undefined);
+  }, []);
+  return subject$;
+};
+
+export default useMemoSubject;

package/es/framework/rxjs-hooks/useObservable.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const useObservable: <T>(fn: Function, dep?: React.DependencyList) => void;
+export default useObservable;

package/es/framework/rxjs-hooks/useObservable.js

@@ -0,0 +1,20 @@
+/*
+ * @Author: wangxian
+ * @Date: 2022-03-30 10:12:11
+ * @LastEditTime: 2022-03-30 10:52:51
+ */
+import React from 'react';
+
+var useObservable = function useObservable(fn) {
+  var dep = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  React.useEffect(function () {
+    var subscription = dep[0] && dep[0].subscribe(function (p) {
+      fn(p);
+    });
+    return function () {
+      return subscription && subscription.unsubscribe();
+    };
+  }, dep);
+};
+
+export default useObservable;

package/es/index.d.ts

@@ -8,4 +8,6 @@ export { default as MdEditor } from './comps/MdEdit';
 export { default as Editable } from './comps/Editable';
 export * from './framework/metadata/index';
 export { default as http, addInterceptor } from './framework/http/index';
+export { default as useMemoSubject } from './framework/rxjs-hooks/useMemoSubject';
+export { default as useObservable } from './framework/rxjs-hooks/useObservable';
 export { registerMetadataAPI } from './framework/metadata/MetadataService';

package/es/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-03-16 16:51:12
+ * @LastEditTime: 2022-03-30 10:55:03
  */
 export { default as MetadataEdit } from './comps/MetadataEdit';
 export { default as MetaPropsEdit } from './comps/MetadataEdit/components/MetaPropsEdit';
@@ -13,4 +13,6 @@ export { default as MdEditor } from './comps/MdEdit';
 export { default as Editable } from './comps/Editable';
 export * from './framework/metadata/index';
 export { default as http, addInterceptor } from './framework/http/index';
+export { default as useMemoSubject } from './framework/rxjs-hooks/useMemoSubject';
+export { default as useObservable } from './framework/rxjs-hooks/useObservable';
 export { registerMetadataAPI } from './framework/metadata/MetadataService';

package/package.json

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