ronds-metadata 1.0.79 → 1.0.80

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

@@ -383,7 +383,7 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
         }
       }))), (refIds[index] || refSchema[index]) && /*#__PURE__*/React.createElement("div", {
         style: {
-          border: '1px solid #d9d9d9',
+          border: 'var(--color-border-1)',
           padding: '10px',
           marginBottom: '10px'
         }

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

@@ -130,7 +130,7 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
           case 'number':
             return /*#__PURE__*/React.createElement("div", {
               style: {
-                border: '1px solid #d9d9d9',
+                border: 'var(--color-border-1)',
                 padding: '10px',
                 marginBottom: '10px'
               }
@@ -154,7 +154,7 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
           case 'ref':
             return /*#__PURE__*/React.createElement("div", {
               style: {
-                border: '1px solid #d9d9d9',
+                border: '1px solid var(--color-border-1)',
                 padding: '10px',
                 display: 'flex',
                 alignItems: 'center',
@@ -214,7 +214,7 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
           case 'array':
             return /*#__PURE__*/React.createElement("div", {
               style: {
-                border: '1px solid #d9d9d9',
+                border: '1px solid var(--color-border-1)',
                 borderRadius: '5px',
                 padding: '10px',
                 marginBottom: '10px',
@@ -301,7 +301,7 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
           case 'enum':
             return /*#__PURE__*/React.createElement("div", {
               style: {
-                border: '1px solid #d9d9d9',
+                border: '1px solid var(--color-border-1)',
                 padding: '10px',
                 marginBottom: '10px'
               }

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

@@ -208,7 +208,7 @@ var MetaFieldsEdit = function MetaFieldsEdit(props) {
         }
       }))), refIds[index] && /*#__PURE__*/React.createElement("div", {
         style: {
-          border: '1px solid #d9d9d9',
+          border: '1px solid var(--color-border-1)',
           padding: '10px',
           marginBottom: '10px'
         }

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

@@ -158,7 +158,7 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
           case 'number':
             return /*#__PURE__*/React.createElement("div", {
               style: {
-                border: '1px solid #d9d9d9',
+                border: '1px solid var(--color-border-1)',
                 padding: '10px',
                 marginBottom: '10px'
               }
@@ -179,7 +179,7 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
           case 'ref':
             return /*#__PURE__*/React.createElement("div", {
               style: {
-                border: '1px solid #d9d9d9',
+                border: '1px solid var(--color-border-1)',
                 padding: '10px',
                 display: 'flex',
                 alignItems: 'center',
@@ -231,7 +231,7 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
           case 'array':
             return /*#__PURE__*/React.createElement("div", {
               style: {
-                border: '1px solid #d9d9d9',
+                border: '1px solid var(--color-border-1)',
                 borderRadius: '5px',
                 padding: '10px',
                 marginBottom: '10px',
@@ -309,7 +309,7 @@ var MetaPropsEdit = function MetaPropsEdit(props) {
           case 'enum':
             return /*#__PURE__*/React.createElement("div", {
               style: {
-                border: '1px solid #d9d9d9',
+                border: '1px solid var(--color-border-1)',
                 padding: '10px',
                 marginBottom: '10px'
               }

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

@@ -8,7 +8,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-06 12:08:47
+ * @LastEditTime: 2022-05-07 10:48:55
  */
 import React from 'react';
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
@@ -73,7 +73,7 @@ function Index(props) {
   }, help || (items === null || items === void 0 ? void 0 : items.type))), /*#__PURE__*/React.createElement("div", {
     style: {
       padding: '10px',
-      border: '1px solid #d9d9d9',
+      border: '1px solid var(--color-border-1)',
       width: '100%',
       borderRadius: '4px'
     }

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

@@ -161,7 +161,7 @@ function Index(props) {
     }, extraInfo.label || id)), /*#__PURE__*/React.createElement("div", {
       style: {
         padding: '10px',
-        border: '1px solid #d9d9d9',
+        border: '1px solid var(--color-border-1)',
         width: '100%',
         borderRadius: '4px'
       }
@@ -176,7 +176,7 @@ function Index(props) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       style: {
         padding: '10px',
-        border: '1px solid #d9d9d9',
+        border: '1px solid var(--color-border-1)',
         width: '100%',
         borderRadius: '4px'
       }

package/es/comps/MetadataForm/utils.js

@@ -5,7 +5,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-05-06 11:24:37
+ * @LastEditTime: 2022-05-06 13:43:47
  */
 import React from 'react';
 import Input from './DataCell/Input';
@@ -63,47 +63,5 @@ export function renderForm(schemaRef, options, stream$) {
     _form.push(getDataCell(_properties[i], options));
   }
 
-  hasRenderAfter(_form, stream$);
   return /*#__PURE__*/React.createElement(React.Fragment, null, _form);
-}
-var __ref__ = [];
-var __count__ = 0;
-
-function hasRenderAfter(_form, stream$) {
-  var _loop = function _loop(i) {
-    if (_form[i].props.type === 'ref') {
-      if (__ref__.findIndex(function (it) {
-        return it === _form[i].key;
-      }) === -1) {
-        __ref__.push(_form[i].key);
-      }
-    } // if (_form[i].props.type === 'array' && _form[i].props.items.type === 'ref') {
-    //   if (__ref__.findIndex((it) => it === _form[i].key) === -1) {
-    //     __ref__.push(_form[i].key);
-    //   }
-    // }
-
-  };
-
-  for (var i = 0; i < _form.length; i++) {
-    _loop(i);
-  }
-
-  var idx = _form.findIndex(function (it) {
-    return it.props.type === 'ref';
-  }); // 表单渲染结束
-
-
-  if (idx === -1) {
-    __count__ = __count__ + 1;
-
-    if (__count__ === __ref__.length && __ref__.length !== 0) {
-      stream$ && stream$.next({
-        type: 'onRenderAfter',
-        payload: ''
-      });
-      __ref__ = [];
-      __count__ = 0;
-    }
-  }
 }

package/es/config.d.ts

@@ -1,14 +1,17 @@
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 export interface IConfig {
     /** 多语言 */
     locale: 'zh-CN' | 'en-US';
+    theme: 'normal' | 'dark';
     msgpack: boolean;
     openLoading: boolean;
     baseUrl: string;
 }
+export declare const cssPrefix = "ronds-metadata";
+export declare const globalSettingStream: BehaviorSubject<IConfig>;
 /** 设置配置 */
 export declare const setConfig: (opts: Partial<IConfig>) => void;
 /**  获取单个配置 */
 export declare function getConfigByKey<K extends keyof IConfig>(key: K): IConfig[K];
 /**  获取全部配置 */
 export declare const getConfig: () => IConfig;
-export declare const cssPrefix = "ronds-base-chart";

package/es/config.js

@@ -1,10 +1,31 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { distinctUntilChanged } from 'rxjs/internal/operators/distinctUntilChanged';
+import { map } from 'rxjs/internal/operators/map';
+import * as jq from './framework/libs/jquery.min.js';
+window.jQuery = window.jQuery || jq;
 var defaultConfig = {
   locale: 'zh-CN',
+  theme: 'normal',
   msgpack: false,
   openLoading: true,
   baseUrl: '/phm'
 };
+export var cssPrefix = 'ronds-metadata';
+export var globalSettingStream = new BehaviorSubject({
+  locale: 'zh-CN',
+  theme: 'normal',
+  msgpack: false,
+  openLoading: true,
+  baseUrl: '/phm'
+});
+globalSettingStream.pipe(map(function (p) {
+  return p.theme;
+}), distinctUntilChanged()).subscribe(function (p) {
+  window.jQuery('body').removeClass("".concat(cssPrefix, "-dark"));
+  window.jQuery('body').removeClass("".concat(cssPrefix, "-normal"));
+  window.jQuery('body').addClass("".concat(cssPrefix, "-").concat(p));
+});
 var config = defaultConfig;
 /** 设置配置 */
 
@@ -20,5 +41,4 @@ export function getConfigByKey(key) {
 
 export var getConfig = function getConfig() {
   return config;
-};
-export var cssPrefix = 'ronds-base-chart';
+};