assui 2.1.52 → 2.1.54

package/es/index.d.ts

@@ -48,6 +48,7 @@ export type { LabelTextAreaProps } from './label-text-area';
 export { default as LabelTextArea } from './label-text-area';
 export type { AreaTextProps } from './area-text';
 export { default as AreaText } from './area-text';
+export type { JSONEditorProps } from './json-editor';
 export { default as JsonEditor } from './json-editor';
 export type { LabelRangePickerProps } from './label-range-picker';
 export { default as LabelRangePicker } from './label-range-picker';

package/es/json-editor/index.d.ts

@@ -1,2 +1,10 @@
-declare const Jsoneditor: () => JSX.Element;
-export default Jsoneditor;
+import type { JSONEditorOptions } from 'jsoneditor';
+import React from 'react';
+export declare type JSONEditorProps = {
+    className?: string;
+    options?: JSONEditorOptions;
+    onChange?: (value: string) => void;
+    value?: string;
+};
+declare const ForwardRefJsonEditor: React.ForwardRefExoticComponent<JSONEditorProps & React.RefAttributes<unknown>>;
+export default ForwardRefJsonEditor;

package/es/json-editor/index.js

@@ -1,17 +1,103 @@
+var __assign = this && this.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+      r,
+      ar = [],
+      e;
+
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) {
+      ar.push(r.value);
+    }
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+
+  return ar;
+};
+
 import JSONEditor from 'jsoneditor';
-import React, { useEffect } from 'react';
+import React, { useEffect, useImperativeHandle } from 'react';
+import useControllableValue from "ahooks/es/useControllableValue";
+import useMount from "ahooks/es/useMount";
+import isEqual from 'lodash/isEqual';
+import useUnmount from "ahooks/es/useUnmount";
+import classNames from 'classnames';
+
+var JsonEditor = function JsonEditor(props, ref) {
+  var options = props.options,
+      className = props.className;
+
+  var _a = __read(useControllableValue(props), 2),
+      value = _a[0],
+      setValue = _a[1];
 
-var Jsoneditor = function Jsoneditor() {
   var containerRef = React.useRef();
+  var editorInstanceRef = React.useRef();
+  useMount(function () {
+    editorInstanceRef.current = new JSONEditor(containerRef.current, __assign(__assign({
+      mode: 'code',
+      indentation: 2
+    }, options), {
+      onChangeText: function onChangeText() {
+        var _a;
+
+        try {
+          var currentJson = (_a = editorInstanceRef.current) === null || _a === void 0 ? void 0 : _a.get();
+          setValue(currentJson);
+        } catch (error) {
+          console.log('error', error);
+        }
+      }
+    }));
+  });
+  useImperativeHandle(ref, function () {
+    return containerRef.current;
+  });
   useEffect(function () {
-    var options = {};
-    var editor = new JSONEditor(containerRef.current, options);
-  }, []);
+    var _a, _b;
+
+    if (value && !isEqual(value, (_a = editorInstanceRef.current) === null || _a === void 0 ? void 0 : _a.get())) {
+      (_b = editorInstanceRef.current) === null || _b === void 0 ? void 0 : _b.update(value);
+    }
+  }, [value]);
+  useUnmount(function () {
+    var _a;
+
+    (_a = editorInstanceRef.current) === null || _a === void 0 ? void 0 : _a.destroy();
+  });
   return /*#__PURE__*/React.createElement("div", {
     ref: function ref(el) {
       return containerRef.current = el;
-    }
+    },
+    className: classNames('a-jason-editor', className)
   });
 };
 
-export default Jsoneditor;
+var ForwardRefJsonEditor = /*#__PURE__*/React.forwardRef(JsonEditor);
+export default ForwardRefJsonEditor;

package/es/json-editor/style/index.css

@@ -0,0 +1,3 @@
+.a-jason-editor .jsoneditor-menu {
+  display: none;
+}

package/es/json-editor/style/index.d.ts

@@ -1 +1,2 @@
 import 'jsoneditor/dist/jsoneditor.min.css';
+import './index.less';

package/es/json-editor/style/index.js

@@ -1 +1,2 @@
-import 'jsoneditor/dist/jsoneditor.min.css';
+import 'jsoneditor/dist/jsoneditor.min.css';
+import './index.less';

package/es/json-editor/style/index.less

@@ -0,0 +1,5 @@
+.a-jason-editor {
+  .jsoneditor-menu {
+    display: none;
+  }
+}

package/es/label-customize-range-picker/index.d.ts

@@ -14,6 +14,7 @@ export interface LabelCustomizeRangePickerProps extends Omit<LabelRangePickerPro
     label?: React.ReactNode;
     /** 最大时间范围 */
     maxScope?: number;
+    showShortcutPanel?: boolean;
 }
 declare const LabelCustomizeRangePicker: (props: LabelCustomizeRangePickerProps) => JSX.Element;
 export default LabelCustomizeRangePicker;

package/es/label-customize-range-picker/index.js

@@ -77,23 +77,25 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
       showTime = props.showTime,
       maxScope = props.maxScope,
       onOpenChange = props.onOpenChange,
-      restProps = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label", "showTime", "maxScope", "onOpenChange"]);
+      _b = props.showShortcutPanel,
+      showShortcutPanel = _b === void 0 ? true : _b,
+      restProps = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label", "showTime", "maxScope", "onOpenChange", "showShortcutPanel"]);
 
-  var _b = __read(useControllableValue(props), 2),
-      date = _b[0],
-      setDate = _b[1];
+  var _c = __read(useControllableValue(props), 2),
+      date = _c[0],
+      setDate = _c[1];
 
-  var _c = __read(useState(false), 2),
-      isVisiblePanel = _c[0],
-      setIsVisiblePanel = _c[1];
+  var _d = __read(useState(false), 2),
+      isVisiblePanel = _d[0],
+      setIsVisiblePanel = _d[1];
 
-  var _d = __read(useState(), 2),
-      radioKey = _d[0],
-      setRadioKey = _d[1];
+  var _e = __read(useState(), 2),
+      radioKey = _e[0],
+      setRadioKey = _e[1];
 
-  var _e = __read(useState(false), 2),
-      open = _e[0],
-      setOpen = _e[1];
+  var _f = __read(useState(false), 2),
+      open = _f[0],
+      setOpen = _f[1];
 
   var messages = useContext(LocaleContext);
   var dataSource = radioList !== null && radioList !== void 0 ? radioList : getDefaultRadioList(messages);
@@ -132,8 +134,18 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
     }
   }, [date]);
   useEffect(function () {
+    var _a = __read(date || [], 2),
+        startTime = _a[0],
+        endTime = _a[1];
+
     if (maxScope) {
-      setDate(formatMaxScope(date, maxScope));
+      var _b = __read(formatMaxScope(date, maxScope), 2),
+          newStartDate = _b[0],
+          newEndDate = _b[1];
+
+      if (!(newStartDate === null || newStartDate === void 0 ? void 0 : newStartDate.isSame(startTime)) || !(newEndDate === null || newEndDate === void 0 ? void 0 : newEndDate.isSame(endTime))) {
+        setDate(formatMaxScope(date, maxScope));
+      }
     }
   }, [maxScope]);
 
@@ -247,7 +259,7 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
     onChange: onDateChange,
     open: open,
     onOpenChange: handleOpenChange,
-    panelRender: panelRender,
+    panelRender: showShortcutPanel ? panelRender : undefined,
     allowClear: false
   };
   return rangePickerType === 'label' ? /*#__PURE__*/React.createElement(LabelRangePicker, __assign({

package/lib/index.d.ts

@@ -48,6 +48,7 @@ export type { LabelTextAreaProps } from './label-text-area';
 export { default as LabelTextArea } from './label-text-area';
 export type { AreaTextProps } from './area-text';
 export { default as AreaText } from './area-text';
+export type { JSONEditorProps } from './json-editor';
 export { default as JsonEditor } from './json-editor';
 export type { LabelRangePickerProps } from './label-range-picker';
 export { default as LabelRangePicker } from './label-range-picker';

package/lib/json-editor/index.d.ts

@@ -1,2 +1,10 @@
-declare const Jsoneditor: () => JSX.Element;
-export default Jsoneditor;
+import type { JSONEditorOptions } from 'jsoneditor';
+import React from 'react';
+export declare type JSONEditorProps = {
+    className?: string;
+    options?: JSONEditorOptions;
+    onChange?: (value: string) => void;
+    value?: string;
+};
+declare const ForwardRefJsonEditor: React.ForwardRefExoticComponent<JSONEditorProps & React.RefAttributes<unknown>>;
+export default ForwardRefJsonEditor;

package/lib/json-editor/index.js

@@ -1,5 +1,21 @@
 "use strict";
 
+var __assign = this && this.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
 var __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
   if (k2 === undefined) k2 = k;
   var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -40,6 +56,33 @@ var __importStar = this && this.__importStar || function (mod) {
   return result;
 };
 
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+      r,
+      ar = [],
+      e;
+
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) {
+      ar.push(r.value);
+    }
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+
+  return ar;
+};
+
 var __importDefault = this && this.__importDefault || function (mod) {
   return mod && mod.__esModule ? mod : {
     "default": mod
@@ -54,17 +97,65 @@ var jsoneditor_1 = __importDefault(require("jsoneditor"));
 
 var react_1 = __importStar(require("react"));
 
-var Jsoneditor = function Jsoneditor() {
+var useControllableValue_1 = __importDefault(require("ahooks/lib/useControllableValue"));
+
+var useMount_1 = __importDefault(require("ahooks/lib/useMount"));
+
+var isEqual_1 = __importDefault(require("lodash/isEqual"));
+
+var useUnmount_1 = __importDefault(require("ahooks/lib/useUnmount"));
+
+var classnames_1 = __importDefault(require("classnames"));
+
+var JsonEditor = function JsonEditor(props, ref) {
+  var options = props.options,
+      className = props.className;
+
+  var _a = __read((0, useControllableValue_1["default"])(props), 2),
+      value = _a[0],
+      setValue = _a[1];
+
   var containerRef = react_1["default"].useRef();
+  var editorInstanceRef = react_1["default"].useRef();
+  (0, useMount_1["default"])(function () {
+    editorInstanceRef.current = new jsoneditor_1["default"](containerRef.current, __assign(__assign({
+      mode: 'code',
+      indentation: 2
+    }, options), {
+      onChangeText: function onChangeText() {
+        var _a;
+
+        try {
+          var currentJson = (_a = editorInstanceRef.current) === null || _a === void 0 ? void 0 : _a.get();
+          setValue(currentJson);
+        } catch (error) {
+          console.log('error', error);
+        }
+      }
+    }));
+  });
+  (0, react_1.useImperativeHandle)(ref, function () {
+    return containerRef.current;
+  });
   (0, react_1.useEffect)(function () {
-    var options = {};
-    var editor = new jsoneditor_1["default"](containerRef.current, options);
-  }, []);
+    var _a, _b;
+
+    if (value && !(0, isEqual_1["default"])(value, (_a = editorInstanceRef.current) === null || _a === void 0 ? void 0 : _a.get())) {
+      (_b = editorInstanceRef.current) === null || _b === void 0 ? void 0 : _b.update(value);
+    }
+  }, [value]);
+  (0, useUnmount_1["default"])(function () {
+    var _a;
+
+    (_a = editorInstanceRef.current) === null || _a === void 0 ? void 0 : _a.destroy();
+  });
   return react_1["default"].createElement("div", {
     ref: function ref(el) {
       return containerRef.current = el;
-    }
+    },
+    className: (0, classnames_1["default"])('a-jason-editor', className)
   });
 };
 
-exports["default"] = Jsoneditor;
+var ForwardRefJsonEditor = react_1["default"].forwardRef(JsonEditor);
+exports["default"] = ForwardRefJsonEditor;

package/lib/json-editor/style/index.css

@@ -0,0 +1,3 @@
+.a-jason-editor .jsoneditor-menu {
+  display: none;
+}

package/lib/json-editor/style/index.d.ts

@@ -1 +1,2 @@
 import 'jsoneditor/dist/jsoneditor.min.css';
+import './index.less';

package/lib/json-editor/style/index.js

@@ -4,4 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-require("jsoneditor/dist/jsoneditor.min.css");
+require("jsoneditor/dist/jsoneditor.min.css");
+
+require("./index.less");

package/lib/json-editor/style/index.less

@@ -0,0 +1,5 @@
+.a-jason-editor {
+  .jsoneditor-menu {
+    display: none;
+  }
+}

package/lib/label-customize-range-picker/index.d.ts

@@ -14,6 +14,7 @@ export interface LabelCustomizeRangePickerProps extends Omit<LabelRangePickerPro
     label?: React.ReactNode;
     /** 最大时间范围 */
     maxScope?: number;
+    showShortcutPanel?: boolean;
 }
 declare const LabelCustomizeRangePicker: (props: LabelCustomizeRangePickerProps) => JSX.Element;
 export default LabelCustomizeRangePicker;

package/lib/label-customize-range-picker/index.js

@@ -141,23 +141,25 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
       showTime = props.showTime,
       maxScope = props.maxScope,
       onOpenChange = props.onOpenChange,
-      restProps = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label", "showTime", "maxScope", "onOpenChange"]);
+      _b = props.showShortcutPanel,
+      showShortcutPanel = _b === void 0 ? true : _b,
+      restProps = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label", "showTime", "maxScope", "onOpenChange", "showShortcutPanel"]);
 
-  var _b = __read((0, useControllableValue_1["default"])(props), 2),
-      date = _b[0],
-      setDate = _b[1];
+  var _c = __read((0, useControllableValue_1["default"])(props), 2),
+      date = _c[0],
+      setDate = _c[1];
 
-  var _c = __read((0, react_1.useState)(false), 2),
-      isVisiblePanel = _c[0],
-      setIsVisiblePanel = _c[1];
+  var _d = __read((0, react_1.useState)(false), 2),
+      isVisiblePanel = _d[0],
+      setIsVisiblePanel = _d[1];
 
-  var _d = __read((0, react_1.useState)(), 2),
-      radioKey = _d[0],
-      setRadioKey = _d[1];
+  var _e = __read((0, react_1.useState)(), 2),
+      radioKey = _e[0],
+      setRadioKey = _e[1];
 
-  var _e = __read((0, react_1.useState)(false), 2),
-      open = _e[0],
-      setOpen = _e[1];
+  var _f = __read((0, react_1.useState)(false), 2),
+      open = _f[0],
+      setOpen = _f[1];
 
   var messages = (0, react_1.useContext)(context_1["default"]);
   var dataSource = radioList !== null && radioList !== void 0 ? radioList : (0, defaultRadioList_1["default"])(messages);
@@ -196,8 +198,18 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
     }
   }, [date]);
   (0, react_1.useEffect)(function () {
+    var _a = __read(date || [], 2),
+        startTime = _a[0],
+        endTime = _a[1];
+
     if (maxScope) {
-      setDate((0, utils_1.formatMaxScope)(date, maxScope));
+      var _b = __read((0, utils_1.formatMaxScope)(date, maxScope), 2),
+          newStartDate = _b[0],
+          newEndDate = _b[1];
+
+      if (!(newStartDate === null || newStartDate === void 0 ? void 0 : newStartDate.isSame(startTime)) || !(newEndDate === null || newEndDate === void 0 ? void 0 : newEndDate.isSame(endTime))) {
+        setDate((0, utils_1.formatMaxScope)(date, maxScope));
+      }
     }
   }, [maxScope]);
 
@@ -311,7 +323,7 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
     onChange: onDateChange,
     open: open,
     onOpenChange: handleOpenChange,
-    panelRender: panelRender,
+    panelRender: showShortcutPanel ? panelRender : undefined,
     allowClear: false
   };
   return rangePickerType === 'label' ? react_1["default"].createElement(label_range_picker_1["default"], __assign({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assui",
-  "version": "2.1.52",
+  "version": "2.1.54",
   "description": "react ui library",
   "author": "jason <usochen@gmail.com>",
   "main": "./lib/index.js",
@@ -40,6 +40,8 @@
     "bignumber.js": "^9.0.1",
     "copy-to-clipboard": "^3.3.1",
     "echarts": "^5.1.2",
+    "jsoneditor": "^9.9.0",
+    "jsoneditor-react": "^3.1.2",
     "qrcode": "^1.4.4",
     "rc-motion": "^2.4.4",
     "rc-util": "^5.13.2",
@@ -60,6 +62,7 @@
   "devDependencies": {
     "@types/enzyme": "^3.10.5",
     "@types/insert-css": "^2.0.1",
+    "@types/jsoneditor": "^9.5.1",
     "@types/qrcode": "^1.4.1",
     "@types/react-highlight-words": "^0.16.3",
     "@types/react-transition-group": "^4.4.2",
@@ -73,5 +76,5 @@
     "node": ">=10.0.0"
   },
   "license": "MIT",
-  "gitHead": "f131b5a8ff5cd8f82b12a2b84431fc02d5435d69"
+  "gitHead": "17d94d75438b08256e76b9839610f2f26a474bf1"
 }