ronds-metadata 1.1.76 → 1.1.77

package/es/comps/Editable/comps/EditableRow.js

@@ -3,17 +3,21 @@ import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React from 'react';
-import { EditableContext } from '../interface';
+import { useDrag, useDrop } from 'react-dnd';
+import { DND_TYPE, EditableContext } from '../interface';
 
 var EditableRow = function EditableRow(props) {
   var record = props.record,
       index = props.index,
-      className = props.className;
+      className = props.className,
+      onMove = props.onMove;
 
   var _Form$useForm = _Form.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
       form = _Form$useForm2[0];
 
+  var ref = React.useRef(null);
+
   var _ref = React.useContext(EditableContext) || undefined,
       editableStream = _ref.editableStream;
 
@@ -22,6 +26,55 @@ var EditableRow = function EditableRow(props) {
     form.setFieldsValue(record);
   }, [record]);
 
+  var _useDrop = useDrop({
+    accept: DND_TYPE,
+    collect: function collect(monitor) {
+      var _ref2 = monitor.getItem() || {},
+          dragIndex = _ref2.index;
+
+      if (dragIndex === index || !onMove) {
+        return {};
+      }
+
+      return {
+        isOver: monitor.isOver(),
+        dropClassName: dragIndex < index ? ' drop-over-downward' : ' drop-over-upward'
+      };
+    },
+    drop: function drop(item, monitor) {
+      onMove && onMove({
+        dragIndex: item.index,
+        hoverIndex: index
+      });
+    }
+  }),
+      _useDrop2 = _slicedToArray(_useDrop, 2),
+      _useDrop2$ = _useDrop2[0],
+      isOver = _useDrop2$.isOver,
+      dropClassName = _useDrop2$.dropClassName,
+      drop = _useDrop2[1];
+
+  var _useDrag = useDrag({
+    item: {
+      index: index,
+      type: DND_TYPE
+    },
+    end: function end(item, monitor) {
+      var dropResult = monitor.getDropResult();
+
+      if (item && dropResult) {}
+    },
+    collect: function collect(monitor) {
+      return {
+        isDragging: monitor.isDragging()
+      };
+    }
+  }),
+      _useDrag2 = _slicedToArray(_useDrag, 2),
+      drag = _useDrag2[1];
+
+  onMove && drop(drag(ref));
+
   var onValuesChange = function onValuesChange(values, allValues) {
     if (editableStream) {
       editableStream.next({
@@ -50,8 +103,10 @@ var EditableRow = function EditableRow(props) {
     initialValues: record,
     onValuesChange: onValuesChange,
     component: false
-  }, /*#__PURE__*/React.createElement("tr", _extends({}, props, {
-    className: "".concat(index % 2 === 0 ? 'ant-table-row--even' : 'ant-table-row--odd', " ").concat(className, " "),
+  }, /*#__PURE__*/React.createElement("tr", _extends({
+    ref: ref
+  }, props, {
+    className: "".concat(index % 2 === 0 ? 'ant-table-row--even' : 'ant-table-row--odd', " ").concat(className, " ").concat(isOver ? dropClassName : '', " "),
     style: {
       height: '30px',
       fontSize: '13px'

package/es/comps/Editable/comps/index.less

@@ -28,3 +28,11 @@
 .font-bold {
   font-weight: bold;
 }
+
+.drop-over-downward td {
+  border-bottom: 2px dashed #1890ff !important;
+}
+
+.drop-over-upward td {
+  border-top: 2px dashed #1890ff !important;
+}

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

@@ -49,6 +49,10 @@ interface IEditableProps<R = any> {
      * 每行确认回调函数
      */
     onRowClick?: (record: any) => void;
+    /**
+     * 行移动
+     */
+    onMove?: (record: any) => void;
     /**
      * 表格按钮点击事件
      */

package/es/comps/Editable/index.js

@@ -10,6 +10,8 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React from 'react';
 import { pick, isArray } from 'lodash';
+import { DndProvider } from 'react-dnd';
+import { HTML5Backend } from 'react-dnd-html5-backend';
 import EditableCell from './comps/EditableCell';
 import EditableRow from './comps/EditableRow';
 import { EditableContext } from './interface';
@@ -37,6 +39,7 @@ var Editable = function Editable(props) {
       _props$isAction = props.isAction,
       isAction = _props$isAction === void 0 ? true : _props$isAction,
       tableProps = props.tableProps,
+      onMove = props.onMove,
       onRowClick = props.onRowClick,
       onButtonCellClick = props.onButtonCellClick,
       onRowConfirm = props.onRowConfirm,
@@ -332,6 +335,8 @@ var Editable = function Editable(props) {
         editHeardCellKey: editHeardCellKey
       }
     }
+  }, /*#__PURE__*/React.createElement(DndProvider, {
+    backend: HTML5Backend
   }, /*#__PURE__*/React.createElement(_Table, _extends({
     key: _columns.length,
     className: "ronds-edit-table",
@@ -358,10 +363,11 @@ var Editable = function Editable(props) {
     onRow: function onRow(record, index) {
       return {
         record: record,
-        index: index
+        index: index,
+        onMove: onMove
       };
     }
-  })), (type === 'multiple' || type === 'freedom') && !readonly && isAddRow && defaultValue && /*#__PURE__*/React.createElement(_Button, {
+  }))), (type === 'multiple' || type === 'freedom') && !readonly && isAddRow && defaultValue && /*#__PURE__*/React.createElement(_Button, {
     block: true,
     type: "dashed",
     style: {

package/es/comps/Editable/interface.d.ts

@@ -30,6 +30,7 @@ export interface EditableRowProps extends React.HTMLAttributes<HTMLElement> {
     rowIndex: number;
     record?: any;
     index?: any;
+    onMove?: (data: any) => void;
 }
 export declare type InputType = 'bool' | 'number' | 'text' | 'enum' | string;
 export interface EditColumnsType extends ColumnsType<any> {
@@ -68,3 +69,4 @@ export interface IMultipleProps extends ICommonProps {
 }
 export interface IFreedomProps extends ICommonProps {
 }
+export declare const DND_TYPE = "rzDndTableRow";

package/es/comps/Editable/interface.js

@@ -1,7 +1,8 @@
 /*
  * @Author: wangxian
  * @Date: 2022-03-04 15:07:57
- * @LastEditTime: 2022-09-27 10:11:38
+ * @LastEditTime: 2023-01-04 10:38:53
  */
 import React from 'react';
-export var EditableContext = /*#__PURE__*/React.createContext(null);
+export var EditableContext = /*#__PURE__*/React.createContext(null);
+export var DND_TYPE = 'rzDndTableRow';

package/es/comps/JsonView/index.less

@@ -1,41 +1,41 @@
-pre {
-  margin: 0;
-  font-weight: 900;
-  font-size: 14px;
-}
-.string {
-  color: #3ab54a;
-}
-.number {
-  color: #25aae2;
-}
-.boolean {
-  color: #f98280;
-}
-.null {
-  color: #f1592a;
-}
-.width-10 {
-  width: 10px;
-}
-.key {
-  color: #92278f;
-}
-.open {
-  display: inline-block;
-  width: 12px;
-  height: 12px;
-  background: url('./icon/close.png') no-repeat;
-  background-size: 100% 100%;
-  vertical-align: middle;
-  cursor: pointer;
-}
-.close {
-  display: inline-block;
-  width: 12px;
-  height: 12px;
-  background: url('./icon/open.png') no-repeat;
-  background-size: 100% 100%;
-  vertical-align: middle;
-  cursor: pointer;
-}
+pre {
+  margin: 0;
+  font-weight: 900;
+  font-size: 14px;
+}
+.string {
+  color: #3ab54a;
+}
+.number {
+  color: #25aae2;
+}
+.boolean {
+  color: #f98280;
+}
+.null {
+  color: #f1592a;
+}
+.width-10 {
+  width: 10px;
+}
+.key {
+  color: #92278f;
+}
+.open {
+  display: inline-block;
+  width: 12px;
+  height: 12px;
+  background: url('./icon/close.png') no-repeat;
+  background-size: 100% 100%;
+  vertical-align: middle;
+  cursor: pointer;
+}
+.close {
+  display: inline-block;
+  width: 12px;
+  height: 12px;
+  background: url('./icon/open.png') no-repeat;
+  background-size: 100% 100%;
+  vertical-align: middle;
+  cursor: pointer;
+}

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/package.json

@@ -1,94 +1,94 @@
-{
-  "public": true,
-  "name": "ronds-metadata",
-  "version": "1.1.76",
-  "scripts": {
-    "start": "dumi dev",
-    "docs:build": "dumi build",
-    "docs:deploy": "gh-pages -d docs-dist",
-    "build": "father-build",
-    "deploy": "npm run docs:build && npm run docs:deploy",
-    "release": "npm run build && npm publish",
-    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
-    "test": "umi-test",
-    "test:coverage": "umi-test --coverage",
-    "prepublishOnly": "npm run build"
-  },
-  "main": "es",
-  "module": "es",
-  "types": "es/index.d.ts",
-  "gitHooks": {
-    "pre-commit": "lint-staged"
-  },
-  "lint-staged": {
-    "*.{js,jsx,less,md,json}": [
-      "prettier --write"
-    ],
-    "*.ts?(x)": [
-      "prettier --parser=typescript --write"
-    ]
-  },
-  "files": [
-    "/es"
-  ],
-  "dependencies": {
-    "@antv/x6": "^1.32.2",
-    "@antv/x6-react-shape": "^1.6.0",
-    "@babel/helper-create-regexp-features-plugin": "^7.12.13",
-    "@babel/runtime": "^7.11.2",
-    "@popperjs/core": "^2.4.4",
-    "@types/markdown-navbar": "^1.4.0",
-    "ahooks": "^3.4.0",
-    "axios": "^0.21.4",
-    "babel-plugin-import": "^1.13.3",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "bl": "^5.0.0",
-    "codemirror": "^5.63.0",
-    "codepage": "^1.15.0",
-    "github-markdown-css": "^5.1.0",
-    "immer": "^9.0.14",
-    "lodash": "^4.17.21",
-    "markdown-navbar": "^1.4.3",
-    "qs": "^6.10.1",
-    "react": "^17.0.2",
-    "react-dnd": "^11.1.3",
-    "react-dnd-html5-backend": "^11.1.3",
-    "react-jexcel": "^1.0.2",
-    "react-markdown": "^8.0.3",
-    "react-markdown-editor-lite": "^1.3.2",
-    "react-popper": "^2.2.3",
-    "react-syntax-highlighter": "^15.5.0",
-    "rehype-raw": "^6.1.1",
-    "remark-gfm": "^3.0.1",
-    "rxjs": "^7.5.4",
-    "xlsx": "^0.18.5"
-  },
-  "peerDependencies": {
-    "antd": ">=4.1.5",
-    "react": ">=16.14.0",
-    "react-dom": ">=16.14.0",
-    "react-router": ">=5.0.0",
-    "styled-components": ">=4.1.1"
-  },
-  "devDependencies": {
-    "@types/react": "^17.0.2",
-    "@types/react-dom": "^17.0.2",
-    "@types/react-router": "^5.1.8",
-    "@types/react-window": "^1.8.2",
-    "@types/styled-components": "^5.1.2",
-    "@umijs/test": "^3.0.5",
-    "antd": "^4.18.1",
-    "babel-loader": "^8.1.0",
-    "copy-to-clipboard": "^3.3.1",
-    "css-loader": "^4.2.2",
-    "dumi": "^1.0.16",
-    "father-build": "^1.17.2",
-    "gh-pages": "^3.0.0",
-    "less-loader": "^7.0.0",
-    "lint-staged": "^10.0.7",
-    "prettier": "^2.2.1",
-    "style-loader": "^1.2.1",
-    "webpack-cli": "^3.3.12",
-    "yorkie": "^2.0.0"
-  }
-}
+{
+  "public": true,
+  "name": "ronds-metadata",
+  "version": "1.1.77",
+  "scripts": {
+    "start": "dumi dev",
+    "docs:build": "dumi build",
+    "docs:deploy": "gh-pages -d docs-dist",
+    "build": "father-build",
+    "deploy": "npm run docs:build && npm run docs:deploy",
+    "release": "npm run build && npm publish",
+    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
+    "test": "umi-test",
+    "test:coverage": "umi-test --coverage",
+    "prepublishOnly": "npm run build"
+  },
+  "main": "es",
+  "module": "es",
+  "types": "es/index.d.ts",
+  "gitHooks": {
+    "pre-commit": "lint-staged"
+  },
+  "lint-staged": {
+    "*.{js,jsx,less,md,json}": [
+      "prettier --write"
+    ],
+    "*.ts?(x)": [
+      "prettier --parser=typescript --write"
+    ]
+  },
+  "files": [
+    "/es"
+  ],
+  "dependencies": {
+    "@antv/x6": "^1.32.2",
+    "@antv/x6-react-shape": "^1.6.0",
+    "@babel/helper-create-regexp-features-plugin": "^7.12.13",
+    "@babel/runtime": "^7.11.2",
+    "@popperjs/core": "^2.4.4",
+    "@types/markdown-navbar": "^1.4.0",
+    "ahooks": "^3.4.0",
+    "axios": "^0.21.4",
+    "babel-plugin-import": "^1.13.3",
+    "babel-plugin-transform-remove-console": "^6.9.4",
+    "bl": "^5.0.0",
+    "codemirror": "^5.63.0",
+    "codepage": "^1.15.0",
+    "github-markdown-css": "^5.1.0",
+    "immer": "^9.0.14",
+    "lodash": "^4.17.21",
+    "markdown-navbar": "^1.4.3",
+    "qs": "^6.10.1",
+    "react": "^17.0.2",
+    "react-dnd": "^11.1.3",
+    "react-dnd-html5-backend": "^11.1.3",
+    "react-jexcel": "^1.0.2",
+    "react-markdown": "^8.0.3",
+    "react-markdown-editor-lite": "^1.3.2",
+    "react-popper": "^2.2.3",
+    "react-syntax-highlighter": "^15.5.0",
+    "rehype-raw": "^6.1.1",
+    "remark-gfm": "^3.0.1",
+    "rxjs": "^7.5.4",
+    "xlsx": "^0.18.5"
+  },
+  "peerDependencies": {
+    "antd": ">=4.1.5",
+    "react": ">=16.14.0",
+    "react-dom": ">=16.14.0",
+    "react-router": ">=5.0.0",
+    "styled-components": ">=4.1.1"
+  },
+  "devDependencies": {
+    "@types/react": "^17.0.2",
+    "@types/react-dom": "^17.0.2",
+    "@types/react-router": "^5.1.8",
+    "@types/react-window": "^1.8.2",
+    "@types/styled-components": "^5.1.2",
+    "@umijs/test": "^3.0.5",
+    "antd": "^4.18.1",
+    "babel-loader": "^8.1.0",
+    "copy-to-clipboard": "^3.3.1",
+    "css-loader": "^4.2.2",
+    "dumi": "^1.0.16",
+    "father-build": "^1.17.2",
+    "gh-pages": "^3.0.0",
+    "less-loader": "^7.0.0",
+    "lint-staged": "^10.0.7",
+    "prettier": "^2.2.1",
+    "style-loader": "^1.2.1",
+    "webpack-cli": "^3.3.12",
+    "yorkie": "^2.0.0"
+  }
+}