ronds-metadata 1.3.19 → 1.3.21

package/es/api/index.js

@@ -5,7 +5,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-09-25 17:13:26
+ * @LastEditTime: 2023-11-21 18:51:09
  */
 import { guid, md5 } from '../utils';
 import { addInterceptor, HttpHelper } from '../framework/http';
@@ -261,7 +261,7 @@ var Api = /*#__PURE__*/function () {
         return _regeneratorRuntime.wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              url = '/wx/dataset-web/source/kafka/queue:Kafka:通信平台-kafka:MQTT.TimeScaleData/message/byte';
+              url = '/wx/dataset-web/source/kafka/queue:Kafka:24-kafka:raw.TraitData/message/byte';
               _context8.next = 3;
               return http.post(encodeURI(url), {}, {}, {
                 responseType: 'arraybuffer',

package/es/comps/FormGenerator/comps/Canvas/index.js

@@ -8,7 +8,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2023-02-06 08:24:17
- * @LastEditTime: 2023-07-07 16:01:20
+ * @LastEditTime: 2023-10-12 10:50:46
  */
 import React from 'react';
 import copy from 'copy-to-clipboard';
@@ -67,6 +67,11 @@ var Canvas = function Canvas() {
       type: streamEventType.onClearCanvas
     });
   };
+  var onImportSchema = function onImportSchema() {
+    fGCtx.fgStream && fGCtx.fgStream.next({
+      type: streamEventType.onImportSchema
+    });
+  };
   var onPreview = function onPreview() {
     if (schema.length === 0) {
       var _schema = transFG2Schema(nodesRef.current, settingRef.current, typesRef.current);
@@ -96,6 +101,9 @@ var Canvas = function Canvas() {
     },
     onClick: onClearCanvas
   }, "\u6E05\u7A7A"), /*#__PURE__*/React.createElement(_Button, {
+    style: {
+      marginRight: '8px'
+    },
     type: "primary",
     onClick: function onClick() {
       var _schema = transFG2Schema(nodesRef.current, settingRef.current, typesRef.current);
@@ -103,7 +111,12 @@ var Canvas = function Canvas() {
         _message.success("\u5DF2\u590D\u5236\u5230\u526A\u5207\u677F");
       }
     }
-  }, "\u5BFC\u51FASchema")), schema.length > 0 && /*#__PURE__*/React.createElement(Preview, {
+  }, "\u5BFC\u51FASchema"), /*#__PURE__*/React.createElement(_Button, {
+    style: {
+      marginRight: '8px'
+    },
+    onClick: onImportSchema
+  }, "\u5BFC\u5165")), schema.length > 0 && /*#__PURE__*/React.createElement(Preview, {
     schema: schema
   }), /*#__PURE__*/React.createElement("div", {
     style: {

package/es/comps/FormGenerator/index.d.ts

@@ -4,6 +4,7 @@ interface IFormGeneratorProps {
      * 初始化默认渲染的schema（首次加载渲染）
      */
     defaultSchema?: any;
+    onImportSchema?: () => void;
 }
 declare const FormGenerator: (props: IFormGeneratorProps) => JSX.Element;
 export default FormGenerator;

package/es/comps/FormGenerator/index.js

@@ -3,7 +3,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2023-02-04 13:45:31
- * @LastEditTime: 2023-04-21 09:02:38
+ * @LastEditTime: 2023-10-12 10:48:31
  */
 import React from 'react';
 import { DndProvider } from 'react-dnd';
@@ -19,7 +19,8 @@ import useObservable from '../../framework/rxjs-hooks/useObservable';
 import { streamEventType } from './settings';
 import { transSchema2FG } from './transformer';
 var FormGenerator = function FormGenerator(props) {
-  var defaultSchema = props.defaultSchema;
+  var defaultSchema = props.defaultSchema,
+    onImportSchema = props.onImportSchema;
   var FGStream = useMemoSubject();
   var _React$useState = React.useState({}),
     _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -43,6 +44,9 @@ var FormGenerator = function FormGenerator(props) {
           setTypes(_objectSpread({}, typesRef.current));
         }
         break;
+      case streamEventType.onImportSchema:
+        onImportSchema && onImportSchema();
+        break;
     }
   }, []);
   useObservable(function (p) {

package/es/comps/FormGenerator/settings/index.d.ts

@@ -2384,4 +2384,5 @@ export declare const streamEventType: {
     onDropOver: string;
     onDefaultValue: string;
     onJsonSchema: string;
+    onImportSchema: string;
 };

package/es/comps/FormGenerator/settings/index.js

@@ -2,7 +2,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 /*
  * @Author: wangxian
  * @Date: 2023-02-06 08:24:17
- * @LastEditTime: 2023-06-30 16:21:01
+ * @LastEditTime: 2023-10-12 10:48:05
  */
 import { RefRule, Rule } from './ruleConfig';
 export var inputSchema = [{
@@ -395,5 +395,6 @@ export var streamEventType = {
   onTypesChange: 'onTypesChange',
   onDropOver: 'onDropOver',
   onDefaultValue: 'onDefaultValue',
-  onJsonSchema: 'onJsonSchema'
+  onJsonSchema: 'onJsonSchema',
+  onImportSchema: 'onImportSchema'
 };

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

@@ -16,7 +16,7 @@ import _Input from "antd/es/input";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-08-14 19:17:56
+ * @LastEditTime: 2023-10-18 15:23:06
  */
 import React from 'react';
 import { UploadOutlined } from '@ant-design/icons';
@@ -156,7 +156,8 @@ function Index(props) {
     return /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
       style: {
         flex: 1,
-        paddingRight: '10px'
+        paddingRight: '10px',
+        display: "".concat(extraInfo.hidden ? 'none' : '')
       },
       label: /*#__PURE__*/React.createElement("span", {
         style: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.color) ? {
@@ -216,7 +217,8 @@ function Index(props) {
   }, processInputType((extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.type) || '')) : /*#__PURE__*/React.createElement(_Form.Item, _extends({}, field, {
     style: {
       flex: 1,
-      paddingRight: '10px'
+      paddingRight: '10px',
+      display: "".concat(extraInfo.hidden ? 'none' : '')
     },
     name: [field === null || field === void 0 ? void 0 : field.name],
     rules: [{

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

@@ -4,7 +4,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: your name
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-06-05 18:47:31
+ * @LastEditTime: 2023-11-01 15:56:30
  */
 import { getLocale } from '../../../framework/locale';
 import moment from 'moment';
@@ -61,7 +61,7 @@ export var useWatchDepend = function useWatchDepend(_depends, stream$, name) {
         if ((p === null || p === void 0 ? void 0 : p.type) === STREAM_EVENT_TYPE.ON_VALUES_CHANGE) {
           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$, name);
+            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.val, stream$, name);
             var _dr = dependsRef.current;
             _dr.hidden = _hidden;
             setDepends(_objectSpread({}, _dr));
@@ -69,7 +69,7 @@ export var useWatchDepend = function useWatchDepend(_depends, stream$, name) {
           }
           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$, name);
+            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.val, stream$, name);
             var _dr2 = dependsRef.current;
             _dr2.show = _show;
             setDepends(_objectSpread({}, _dr2));
@@ -77,7 +77,7 @@ export var useWatchDepend = function useWatchDepend(_depends, stream$, name) {
           }
           if (_depends === null || _depends === void 0 ? void 0 : _depends.notRequire) {
             var _p$payload3;
-            var _notRequire = 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 _notRequire = 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.val, stream$, name);
             var _dr3 = dependsRef.current;
             _dr3.notRequire = _notRequire;
             setDepends(_objectSpread({}, _dr3));
@@ -85,7 +85,7 @@ export var useWatchDepend = function useWatchDepend(_depends, stream$, name) {
           }
           if (_depends === null || _depends === void 0 ? void 0 : _depends.disabled) {
             var _p$payload4;
-            var _disabled = processDependHiddenOrShow(_depends === null || _depends === void 0 ? void 0 : _depends.disabled, p === null || p === void 0 ? void 0 : (_p$payload4 = p.payload) === null || _p$payload4 === void 0 ? void 0 : _p$payload4.allVals, stream$, name);
+            var _disabled = processDependHiddenOrShow(_depends === null || _depends === void 0 ? void 0 : _depends.disabled, p === null || p === void 0 ? void 0 : (_p$payload4 = p.payload) === null || _p$payload4 === void 0 ? void 0 : _p$payload4.val, stream$, name);
             var _dr4 = dependsRef.current;
             _dr4.disabled = _disabled;
             setDepends(_objectSpread({}, _dr4));
@@ -99,6 +99,9 @@ export var useWatchDepend = function useWatchDepend(_depends, stream$, name) {
 };
 var processDependHiddenOrShow = function processDependHiddenOrShow(depend, changeData, stream$, name) {
   try {
+    if (depend === "choose.indexOf('1')>-1") {
+      debugger;
+    }
     // const regex = /\w+(\.\w+)?[=<>!]{1}/g;
     var regex = /\w+(\.\w+)?[=<>!]{1}|\w+(\.\w+)?(\.indexOf\('.+'\)[=<>!]{1})/g;
     var keys = depend.trim().replace(/\s/g, '').match(regex);
@@ -114,7 +117,17 @@ var processDependHiddenOrShow = function processDependHiddenOrShow(depend, chang
       for (var _i = 0; _i < name.length; _i++) {
         evalString = "".concat(evalString, "[name[").concat(_i, "]]");
       }
-      var _changeData = eval("".concat(evalString, "['").concat(_key[0], "']"));
+      var _d = eval("".concat(evalString));
+      var _changeData = undefined;
+      // 判断_d 是否为数组
+      if (Array.isArray(_d)) {
+        var _ = _d.filter(function (v) {
+          return !!v;
+        });
+        _changeData = eval("_[0]['".concat(_key[0], "']"));
+      } else {
+        _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);

package/es/framework/proto/index.d.ts

@@ -1,7 +1,3 @@
-declare const protobuf: any;
-declare const data: {
-    name: string;
-    age: number;
-    sexEnum: number;
+export declare function transProtobuf2Json(base64: string, protoSchema: string, message: string): {
+    [k: string]: any;
 };
-declare function setMessage(data: any): void;

package/es/framework/proto/index.js

@@ -1,27 +1,32 @@
 /*
  * @Author: wangxian
  * @Date: 2023-09-22 11:28:45
- * @LastEditTime: 2023-09-22 13:55:58
+ * @LastEditTime: 2023-11-23 15:25:42
  */
-var protobuf = require('protobufjs');
-var data = {
-  name: '狍狍',
-  age: 1,
-  sexEnum: 1
-};
-function setMessage(data) {
-  protobuf.load('./transfer.proto').then(function (root) {
-    // 根据proto文件中的内容对message进行实例化
-    var transferMessage = root.lookupType('transferData.transferMessage');
-    // 验证
-    var errMsg = transferMessage.verify(data);
-    if (errMsg) {
-      throw new Error(errMsg);
-    }
-    // 转换为message实例
-    var messageFromObj = transferMessage.fromObject(data);
-    // 编码
-    var buffer = transferMessage.encode(messageFromObj).finish();
-  }).catch(function () {});
+import protobuf from 'protobufjs';
+function transBase642byte(base64String) {
+  // 解码 Base64 字符串为原始二进制数据
+  var decodedData = window.atob(base64String);
+  // 将解码后的字符串转换为 Uint8Array
+  var uint8Array = new Uint8Array(decodedData.length);
+  for (var i = 0; i < decodedData.length; ++i) {
+    uint8Array[i] = decodedData.charCodeAt(i);
+  }
+  return uint8Array;
 }
-setMessage(data);
+export function transProtobuf2Json(base64, protoSchema, message) {
+  var root = protobuf.parse(protoSchema, {
+    keepCase: true
+  }).root;
+  // 根据proto文件中的内容对message进行实例化
+  var transferMessage = root.lookupType(message);
+  var uint8Array = transBase642byte(base64);
+  try {
+    // 解码消息
+    var result = transferMessage.decode(uint8Array);
+    return transferMessage.toObject(result);
+  } catch (err) {
+    console.error('解码失败:', err);
+    return null;
+  }
+}

package/es/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-09-15 11:32:01
+ * @LastEditTime: 2023-11-23 15:45:56
  */
 import './theme.less';
 export { default as MetadataEdit } from './comps/MetadataEdit';
@@ -30,4 +30,5 @@ export { default as useSyncScroll, useSyncScrollByRefs } from './framework/hooks
 export { registerMetadataAPI } from './framework/metadata/MetadataService';
 export { FormRobot } from './framework/fg/index';
 export { globalSettingStream } from './config';
-export { handleMd2Doc } from './utils';
+export { handleMd2Doc } from './utils';
+// export { transProtobuf2Json } from './framework/proto/index';

package/package.json

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

package/es/framework/proto/transfer.proto

@@ -1,12 +0,0 @@
-syntax = "proto2"
-package transferData;
-
-message transferMessage {
-    required string name = 1;
-    required int32 age = 2;
-    enum SexEnum {
-        Boy = 0;
-        Girl = 1;
-    }
-    optional SexEnum SexEnum = 3;
-}