@pisell/materials 2.2.4 → 2.2.6

package/es/components/table/Table/index.less

@@ -15,6 +15,16 @@
       margin-top: 12px;
     }
   }
+
+  .pisell-lowcode-checkbox{
+    position: static;
+    width: auto!important;
+    height: auto!important;
+  }
+
+  .pisell-lowcode-checkbox-inner, .pisell-lowcode-radio-inner{
+    position: relative
+  }
 }
 
 .materials-grid-table-wrap {

package/es/components/table/Table/tableConfig/body/index.d.ts

@@ -1,6 +1,6 @@
-import type { FormInstance } from "antd/es/form";
-import React from "react";
-import "./index.less";
+import type { FormInstance } from 'antd/es/form';
+import React from 'react';
+import './index.less';
 export declare const EditableContext: React.Context<FormInstance<any> | null>;
 interface Item {
     key: string;
@@ -10,7 +10,7 @@ interface Item {
 }
 export interface RowProps extends React.HTMLAttributes<HTMLTableRowElement> {
     index: number;
-    "data-row-key": string;
+    'data-row-key': string;
     __is_group?: boolean;
     __table_group_field?: string;
     __is_drag_sort?: boolean;

package/es/components/table/Table/tableConfig/body/index.js

@@ -15,12 +15,12 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import { Form, Tooltip } from "antd";
-import { useSortable } from "@dnd-kit/sortable";
-import { CSS } from "@dnd-kit/utilities";
-import { MenuOutlined } from "@ant-design/icons";
-import classNames from "classnames";
-import React, { useMemo } from "react";
+import { Form, Tooltip } from 'antd';
+import { useSortable } from '@dnd-kit/sortable';
+import { CSS } from '@dnd-kit/utilities';
+import { MenuOutlined } from '@ant-design/icons';
+import classNames from 'classnames';
+import React, { useMemo } from 'react';
 import CellProvider from "./CellProvider";
 import { getText } from "../../../../../locales";
 import "./index.less";
@@ -35,9 +35,9 @@ var EditableRow = function EditableRow(_ref) {
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var parentForm = Form.useFormInstance();
-  var order_by = Form.useWatch("order_by", parentForm);
+  var order_by = Form.useWatch('order_by', parentForm);
   var _useSortable = useSortable({
-      id: props["data-row-key"]
+      id: props['data-row-key']
     }),
     attributes = _useSortable.attributes,
     listeners = _useSortable.listeners,
@@ -52,7 +52,7 @@ var EditableRow = function EditableRow(_ref) {
     })),
     transition: transition
   }, isDragging && __is_drag_sort ? {
-    position: "relative",
+    position: 'relative',
     zIndex: 9999
   } : {});
   var cells = useMemo(function () {
@@ -60,20 +60,14 @@ var EditableRow = function EditableRow(_ref) {
       return children;
     }
     return React.Children.map(children, function (child) {
-      if (child.key === "__sort") {
+      if (child.key === '__sort') {
         var handleIcon = order_by ? /*#__PURE__*/React.createElement(Tooltip, {
-          title: getText("table-column-drag-sort-disabled-tip")
+          title: getText('table-column-drag-sort-disabled-tip')
         }, /*#__PURE__*/React.createElement(MenuOutlined, {
-          style: {
-            touchAction: "none",
-            cursor: "move"
-          }
+          className: "pisell-lowcode-menu-out-lined-icon"
         })) : /*#__PURE__*/React.createElement(MenuOutlined, _extends({
           ref: setActivatorNodeRef,
-          style: {
-            touchAction: "none",
-            cursor: "move"
-          }
+          className: "pisell-lowcode-menu-out-lined-icon"
         }, listeners));
         return /*#__PURE__*/React.cloneElement(child, {
           children: handleIcon
@@ -108,7 +102,7 @@ var EditableCell = function EditableCell(props) {
     render = props.render,
     restProps = _objectWithoutProperties(props, _excluded2);
   return /*#__PURE__*/React.createElement("td", _extends({}, restProps, {
-    className: classNames(restProps.className, "ant-table-cell", "materials-grid-table-cell")
+    className: classNames(restProps.className, 'ant-table-cell', 'materials-grid-table-cell')
   }), /*#__PURE__*/React.createElement(CellProvider, props));
 };
 export default {

package/es/components/table/Table/tableConfig/body/index.less

@@ -3,6 +3,19 @@
   height: 100%;
 }
 
+.pisell-lowcode-menu-out-lined-icon{
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  cursor: move;
+  touch-action: none;
+}
+
 .materials-grid-table-cell {
   padding: 12px;
 }

package/es/components/table/Table/utils.d.ts

@@ -155,7 +155,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
+}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "filter_setting")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};

package/es/components/table/index.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
-import "./index.less";
+import React from 'react';
+import './index.less';
 declare const _default: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
 export default _default;

package/es/components/table/index.js

@@ -1,5 +1,5 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-var _excluded = ["dataSource", "columns", "dispatch", "style", "filter", "sort", "buttons", "actionButtons", "title", "summary", "onValuesChange", "columnSetting", "dataSourceGroup", "view", "gallery", "currentSettingKey", "exportImport"];
+var _excluded = ["dataSource", "columns", "dispatch", "style", "filter", "sort", "buttons", "actionButtons", "title", "summary", "onValuesChange", "columnSetting", "dataSourceGroup", "view", "gallery", "currentSettingKey", "exportImport", "currentComponentId"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -14,9 +14,9 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import { useSize } from "ahooks";
-import { Form } from "antd";
-import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useRef } from "react";
+import { useSize } from 'ahooks';
+import { Form } from 'antd';
+import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { useSharedState } from "../../hooks";
 import useEngineContext from "../../hooks/useEngineContext";
 import Actions from "./Actions";
@@ -32,7 +32,7 @@ import useTriggerValuesChange from "./hooks/useTriggerValuesChange";
 import { Context, Provider, formatColumn } from "./model";
 import "./index.less";
 var defaultView = {
-  defaultViewMode: "grid",
+  defaultViewMode: 'grid',
   multiple: false,
   modeList: []
 };
@@ -56,6 +56,7 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
     gallery = props.gallery,
     currentSettingKey = props.currentSettingKey,
     exportImport = props.exportImport,
+    currentComponentId = props.currentComponentId,
     other = _objectWithoutProperties(props, _excluded);
   var modal = useSharedState(Context);
   var _Form$useForm = Form.useForm(),
@@ -63,7 +64,7 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
     form = _Form$useForm2[0];
   var defaultViewMode = view.defaultViewMode,
     multiple = view.multiple;
-  var viewMode = Form.useWatch("view_mode", {
+  var viewMode = Form.useWatch('view_mode', {
     form: form,
     preserve: true
   });
@@ -76,11 +77,12 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
     width = _ref.width;
   var utils = context === null || context === void 0 ? void 0 : (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils;
   var tableId = useMemo(function () {
-    if (props.__designMode === "design") {
-      return "designMode-mock-table-id";
+    console.log(props, 'wh');
+    if (props.__designMode === 'design') {
+      return 'designMode-mock-table-id';
     }
-    return props.__id;
-  }, [props.__id, props.__designMode]);
+    return (props === null || props === void 0 ? void 0 : props.currentComponentId) || props.__id;
+  }, [props.__id, props.__designMode, props === null || props === void 0 ? void 0 : props.currentComponentId]);
   var columns = useMemo(function () {
     return propsColumns.filter(function (item) {
       return !item.hidden;
@@ -120,7 +122,7 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
     return _columns;
   }, [columns]);
   var currentSettingHash = useMemo(function () {
-    return currentSettingKey || getHash(removeTitleColumns) || "";
+    return currentSettingKey || getHash(removeTitleColumns) || '';
   }, [currentSettingKey, JSON.stringify(removeTitleColumns)]);
   useEffect(function () {
     var setting = getTableSettingFromLocalStorage(tableId);
@@ -131,7 +133,7 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
   useEffect(function () {
     if (width) {
       modal.dispatch({
-        type: "setTableWidth",
+        type: 'setTableWidth',
         payload: width || {}
       });
     }
@@ -161,13 +163,13 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
   });
   useEffect(function () {
     modal.dispatch({
-      type: "setUtils",
+      type: 'setUtils',
       payload: utils || {}
     });
   }, [utils]);
   useEffect(function () {
     modal.dispatch({
-      type: "setDefaultColumns",
+      type: 'setDefaultColumns',
       payload: mergeColumnSetting({
         columns: columns,
         tableId: tableId,
@@ -175,36 +177,36 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
       })
     });
     modal.dispatch({
-      type: "setOriginColumns",
+      type: 'setOriginColumns',
       payload: columns
     });
   }, [columns, tableId, currentViewMode]);
   useEffect(function () {
     modal.dispatch({
-      type: "setDataSource",
+      type: 'setDataSource',
       payload: dataSource
     });
     modal.dispatch({
-      type: "setOriginDataSource",
+      type: 'setOriginDataSource',
       payload: dataSource
     });
   }, [dataSource]);
   useEffect(function () {
     modal.dispatch({
-      type: "setTableId",
+      type: 'setTableId',
       payload: tableId
     });
   }, [tableId]);
   useEffect(function () {
     var _other$pagination;
     modal.dispatch({
-      type: "setLocalPagination",
+      type: 'setLocalPagination',
       payload: other === null || other === void 0 ? void 0 : (_other$pagination = other.pagination) === null || _other$pagination === void 0 ? void 0 : _other$pagination.localPagination
     });
   }, [other === null || other === void 0 ? void 0 : (_other$pagination2 = other.pagination) === null || _other$pagination2 === void 0 ? void 0 : _other$pagination2.localPagination]);
   useEffect(function () {
     setTimeout(function () {
-      document.body.id = "body";
+      document.body.id = 'body';
     }, 200);
   }, []);
   var filterDefaultValues = useMemo(function () {
@@ -238,8 +240,8 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
   useEffect(function () {
     // 虚拟表columns由接口获取 columns变更时只重新设置tableSetting
     // 直接设置column_setting对象时useWatch监听数据有误，先设置{}后再设置useWatch可以监听到变更数据
-    form.setFieldValue("column_setting", {});
-    form.setFieldValue("column_setting", tableSettingRef.current.column_setting);
+    form.setFieldValue('column_setting', {});
+    form.setFieldValue('column_setting', tableSettingRef.current.column_setting);
     // JSON.stringify会丢失 render函数变更的监听 使用自定义stringify处理
   }, [stringify(removeTitleColumns)]);
   useEffect(function () {
@@ -254,7 +256,7 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
       var _values = _objectSpread(_objectSpread({}, form.getFieldsValue(true)), values.filters || {});
       var _cur = _objectSpread(_objectSpread({}, cur), cur.filters || {});
       var currentKey = Object.keys(cur)[0];
-      if (currentKey !== "pagination") {
+      if (currentKey !== 'pagination') {
         _values.pagination = _objectSpread(_objectSpread({}, _values.pagination), {}, {
           page: 1
         });
@@ -277,11 +279,11 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
       if (!getIsTriggerValuesChange(cur, values)) {
         return;
       }
-      _onValuesChange === null || _onValuesChange === void 0 ? void 0 : _onValuesChange(omit(_cur, ["filters"]), _values);
+      _onValuesChange === null || _onValuesChange === void 0 ? void 0 : _onValuesChange(omit(_cur, ['filters']), _values);
     },
     className: "materials-grid-form-wrap"
   }, /*#__PURE__*/React.createElement("div", {
-    className: "materials-grid",
+    className: 'materials-grid',
     style: style,
     ref: wrapRef
   }, /*#__PURE__*/React.createElement(Header, {

package/es/components/table/types.d.ts

@@ -212,7 +212,11 @@ export declare type GridViewProps = {
     /**
      * 当前本地配置的key 用此hash是否改变用来判断是否清空本地配置 不填默认使用columns数据生成hash
      */
-    currentSettingKey?: "";
+    currentSettingKey?: string;
+    /**
+    * 当前本地配置的唯一值, 不填默认使用currentSettingKey
+    */
+    currentComponentId?: string;
     /**
      * 当前表格中数据发生变化事件 包含本地筛选和外部传入数据变化
      * @param currentDataSource

package/lib/components/table/Table/index.less

@@ -15,6 +15,16 @@
       margin-top: 12px;
     }
   }
+
+  .pisell-lowcode-checkbox{
+    position: static;
+    width: auto!important;
+    height: auto!important;
+  }
+
+  .pisell-lowcode-checkbox-inner, .pisell-lowcode-radio-inner{
+    position: relative
+  }
 }
 
 .materials-grid-table-wrap {

package/lib/components/table/Table/tableConfig/body/index.d.ts

@@ -1,6 +1,6 @@
-import type { FormInstance } from "antd/es/form";
-import React from "react";
-import "./index.less";
+import type { FormInstance } from 'antd/es/form';
+import React from 'react';
+import './index.less';
 export declare const EditableContext: React.Context<FormInstance<any> | null>;
 interface Item {
     key: string;
@@ -10,7 +10,7 @@ interface Item {
 }
 export interface RowProps extends React.HTMLAttributes<HTMLTableRowElement> {
     index: number;
-    "data-row-key": string;
+    'data-row-key': string;
     __is_group?: boolean;
     __table_group_field?: string;
     __is_drag_sort?: boolean;

package/lib/components/table/Table/tableConfig/body/index.js

@@ -80,11 +80,11 @@ var EditableRow = ({
     }
     return import_react.default.Children.map(children, (child) => {
       if (child.key === "__sort") {
-        const handleIcon = order_by ? /* @__PURE__ */ import_react.default.createElement(import_antd.Tooltip, { title: (0, import_locales.getText)("table-column-drag-sort-disabled-tip") }, /* @__PURE__ */ import_react.default.createElement(import_icons.MenuOutlined, { style: { touchAction: "none", cursor: "move" } })) : /* @__PURE__ */ import_react.default.createElement(
+        const handleIcon = order_by ? /* @__PURE__ */ import_react.default.createElement(import_antd.Tooltip, { title: (0, import_locales.getText)("table-column-drag-sort-disabled-tip") }, /* @__PURE__ */ import_react.default.createElement(import_icons.MenuOutlined, { className: "pisell-lowcode-menu-out-lined-icon" })) : /* @__PURE__ */ import_react.default.createElement(
           import_icons.MenuOutlined,
           {
             ref: setActivatorNodeRef,
-            style: { touchAction: "none", cursor: "move" },
+            className: "pisell-lowcode-menu-out-lined-icon",
             ...listeners
           }
         );

package/lib/components/table/Table/tableConfig/body/index.less

@@ -3,6 +3,19 @@
   height: 100%;
 }
 
+.pisell-lowcode-menu-out-lined-icon{
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  cursor: move;
+  touch-action: none;
+}
+
 .materials-grid-table-cell {
   padding: 12px;
 }

package/lib/components/table/Table/utils.d.ts

@@ -155,7 +155,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
+}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "filter_setting")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};

package/lib/components/table/index.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
-import "./index.less";
+import React from 'react';
+import './index.less';
 declare const _default: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
 export default _default;

package/lib/components/table/index.js

@@ -76,6 +76,7 @@ var GridView = (0, import_model.Provider)(
       currentSettingKey,
       // pagination,
       exportImport,
+      currentComponentId,
       ...other
     } = props;
     const modal = (0, import_hooks.useSharedState)(import_model.Context);
@@ -90,11 +91,12 @@ var GridView = (0, import_model.Provider)(
     const { width } = (0, import_ahooks.useSize)(wrapRef) || {};
     const utils = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils;
     const tableId = (0, import_react.useMemo)(() => {
+      console.log(props, "wh");
       if (props.__designMode === "design") {
         return "designMode-mock-table-id";
       }
-      return props.__id;
-    }, [props.__id, props.__designMode]);
+      return (props == null ? void 0 : props.currentComponentId) || props.__id;
+    }, [props.__id, props.__designMode, props == null ? void 0 : props.currentComponentId]);
     const columns = (0, import_react.useMemo)(() => {
       return propsColumns.filter((item) => !item.hidden);
     }, [propsColumns]);

package/lib/components/table/types.d.ts

@@ -212,7 +212,11 @@ export declare type GridViewProps = {
     /**
      * 当前本地配置的key 用此hash是否改变用来判断是否清空本地配置 不填默认使用columns数据生成hash
      */
-    currentSettingKey?: "";
+    currentSettingKey?: string;
+    /**
+    * 当前本地配置的唯一值, 不填默认使用currentSettingKey
+    */
+    currentComponentId?: string;
     /**
      * 当前表格中数据发生变化事件 包含本地筛选和外部传入数据变化
      * @param currentDataSource

package/lowcode/table/meta.ts

@@ -81,6 +81,15 @@ export default {
           },
           propType: "string",
           setter: "StringSetter",
+        },
+        {
+          name: "currentComponentId",
+          title: {
+            label: "currentComponentId",
+            tip: "currentComponentId | 当前本地配置的唯一值 不填默认使用currentSettingKey",
+          },
+          propType: "string",
+          setter: "StringSetter",
         }
       ],
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "2.2.4",
+  "version": "2.2.6",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",