@vtx/components 4.0.0-beta.25 → 4.0.0-beta.27

package/es/vtx-datagrid/renderColumnButtons.js

@@ -1,5 +1,12 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["confirm"];
+var _excluded = ["confirm"],
+  _excluded2 = ["confirm"];
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -7,12 +14,6 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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; }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import { DownOutlined } from '@ant-design/icons';
 import { Divider, Dropdown, Popconfirm } from 'antd';
 import Icon from "../vtx-icon";
@@ -45,14 +46,32 @@ var renderColumnButtons = function renderColumnButtons(_ref) {
     /* eslint-disable */
     moreRender = /*#__PURE__*/_jsx(Dropdown, {
       menu: {
-        items: (moreActions === null || moreActions === void 0 ? void 0 : moreActions.map(function (item, i) {
+        items: (moreActions === null || moreActions === void 0 ? void 0 : moreActions.map(function (item, index) {
+          var name = item.name,
+            popconfirm = item.popconfirm;
+          if (popconfirm) {
+            var confirm = popconfirm.confirm,
+              rest = _objectWithoutProperties(popconfirm, _excluded);
+            return {
+              key: item.name,
+              label: /*#__PURE__*/_jsx(Popconfirm, _objectSpread(_objectSpread({
+                trigger: ['hover'],
+                onConfirm: confirm ? function () {
+                  return confirm(record, index);
+                } : undefined
+              }, rest), {}, {
+                children: name
+              }))
+            };
+          }
           return {
-            key: i,
+            key: item.name,
             label: item.name
           };
         })) || [],
         onClick: function onClick(e) {
-          moreActions[e.key].onClick(record, index);
+          var _moreActions$e$key;
+          (_moreActions$e$key = moreActions[e.key]) === null || _moreActions$e$key === void 0 || _moreActions$e$key.onClick(record, index);
         }
       },
       children: /*#__PURE__*/_jsxs("a", {
@@ -82,7 +101,7 @@ var renderColumnButtons = function renderColumnButtons(_ref) {
     }, name);
     if (popconfirm) {
       var confirm = popconfirm.confirm,
-        rest = _objectWithoutProperties(popconfirm, _excluded);
+        rest = _objectWithoutProperties(popconfirm, _excluded2);
       btnNode = /*#__PURE__*/_createElement(Popconfirm, _objectSpread(_objectSpread({}, rest), {}, {
         onConfirm: confirm ? function () {
           return confirm(record, index);

package/es/vtx-wang-editor/index.js

@@ -17,14 +17,13 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 /*eslint-disable*/
-import React, { forwardRef, useState, useEffect, useContext, useCallback } from 'react';
+import React, { forwardRef, useState, useEffect, useContext, useCallback, useRef } from 'react';
 import PropTypes from 'prop-types';
 import { Editor, Toolbar } from '@wangeditor/editor-for-react';
 import attachmentModule from '@wangeditor/plugin-upload-attachment';
 import { Boot } from '@wangeditor/editor';
 import getToken from "../utils/getToken";
 import { withEmptyHtml, findAllImgSrcsFromHtml, extractImageDataFromRtf, replaceImagesFileSourceWithInlineRepresentation, replaceAllSpanFontSize, sanitizeHtml } from "./wangEditorUtil";
-import { ConfigProvider } from 'antd';
 import cls from 'classnames';
 import { useStyle } from "./style/index";
 import { FormItemInputContext } from 'antd/es/form/context';
@@ -62,6 +61,7 @@ var VtxWangEditor = function VtxWangEditor(props) {
     setError(error.message);
     // 可以在这里添加错误上报逻辑
   }, []);
+  var valueRef = useRef();
   var _React$useContext = React.useContext(FormItemInputContext),
     contextStatus = _React$useContext.status,
     hasFeedback = _React$useContext.hasFeedback,
@@ -108,6 +108,9 @@ var VtxWangEditor = function VtxWangEditor(props) {
       }
     };
   }, []);
+  useEffect(function () {
+    valueRef.current = value;
+  }, [value]);
 
   // 修改安全的粘贴处理函数
   var handleSafePaste = useCallback( /*#__PURE__*/function () {
@@ -230,10 +233,14 @@ var VtxWangEditor = function VtxWangEditor(props) {
       var newValue = editor.getHtml() || undefined;
       // 对输出内容也进行安全过滤
       var processedValue = enableSanitization && newValue !== undefined ? sanitizeHtml(newValue) : newValue;
-      console.log('编辑器内容变化，处理前内容:', newValue);
-      console.log('编辑器内容变化，处理后内容:', processedValue);
-      if (processedValue !== value) {
-        onChange(processedValue);
+      // console.log('编辑器内容变化，处理前内容:', newValue);
+      // console.log('编辑器内容变化，处理后内容:', processedValue);
+      if (processedValue !== valueRef.current) {
+        if (processedValue === undefined) {
+          onChange('');
+        } else {
+          onChange(processedValue);
+        }
       }
     } catch (error) {
       handleError(new Error('编辑器内容处理失败: ' + error.message));
@@ -268,7 +275,6 @@ var VtxWangEditor = function VtxWangEditor(props) {
         },
         customInsert: function customInsert(res, insertFn) {
           try {
-            console.log(res, insertFn);
             // res 即服务端的返回结果
             // 从 res 中找到 url alt href ，然后插入图片
             if (res.result == 0) {

package/lib/vtx-datagrid/renderColumnButtons.js

@@ -10,8 +10,15 @@ var _antd = require("antd");
 var _vtxIcon = _interopRequireDefault(require("../vtx-icon"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
-var _excluded = ["confirm"];
+var _excluded = ["confirm"],
+  _excluded2 = ["confirm"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -19,12 +26,6 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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; }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 var renderColumnButtons = function renderColumnButtons(_ref) {
   var _renderButtons;
   var renderButtons = _ref.renderButtons,
@@ -51,14 +52,32 @@ var renderColumnButtons = function renderColumnButtons(_ref) {
     /* eslint-disable */
     moreRender = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Dropdown, {
       menu: {
-        items: (moreActions === null || moreActions === void 0 ? void 0 : moreActions.map(function (item, i) {
+        items: (moreActions === null || moreActions === void 0 ? void 0 : moreActions.map(function (item, index) {
+          var name = item.name,
+            popconfirm = item.popconfirm;
+          if (popconfirm) {
+            var confirm = popconfirm.confirm,
+              rest = _objectWithoutProperties(popconfirm, _excluded);
+            return {
+              key: item.name,
+              label: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Popconfirm, _objectSpread(_objectSpread({
+                trigger: ['hover'],
+                onConfirm: confirm ? function () {
+                  return confirm(record, index);
+                } : undefined
+              }, rest), {}, {
+                children: name
+              }))
+            };
+          }
           return {
-            key: i,
+            key: item.name,
             label: item.name
           };
         })) || [],
         onClick: function onClick(e) {
-          moreActions[e.key].onClick(record, index);
+          var _moreActions$e$key;
+          (_moreActions$e$key = moreActions[e.key]) === null || _moreActions$e$key === void 0 || _moreActions$e$key.onClick(record, index);
         }
       },
       children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("a", {
@@ -88,7 +107,7 @@ var renderColumnButtons = function renderColumnButtons(_ref) {
     }, name);
     if (popconfirm) {
       var confirm = popconfirm.confirm,
-        rest = _objectWithoutProperties(popconfirm, _excluded);
+        rest = _objectWithoutProperties(popconfirm, _excluded2);
       btnNode = /*#__PURE__*/(0, _react.createElement)(_antd.Popconfirm, _objectSpread(_objectSpread({}, rest), {}, {
         onConfirm: confirm ? function () {
           return confirm(record, index);

package/lib/vtx-wang-editor/index.js

@@ -12,7 +12,6 @@ var _pluginUploadAttachment = _interopRequireDefault(require("@wangeditor/plugin
 var _editor = require("@wangeditor/editor");
 var _getToken = _interopRequireDefault(require("../utils/getToken"));
 var _wangEditorUtil = require("./wangEditorUtil");
-var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _index = require("./style/index");
 var _context2 = require("antd/es/form/context");
@@ -67,6 +66,7 @@ var VtxWangEditor = exports.VtxWangEditor = function VtxWangEditor(props) {
     setError(error.message);
     // 可以在这里添加错误上报逻辑
   }, []);
+  var valueRef = (0, _react.useRef)();
   var _React$useContext = _react.default.useContext(_context2.FormItemInputContext),
     contextStatus = _React$useContext.status,
     hasFeedback = _React$useContext.hasFeedback,
@@ -113,6 +113,9 @@ var VtxWangEditor = exports.VtxWangEditor = function VtxWangEditor(props) {
       }
     };
   }, []);
+  (0, _react.useEffect)(function () {
+    valueRef.current = value;
+  }, [value]);
 
   // 修改安全的粘贴处理函数
   var handleSafePaste = (0, _react.useCallback)( /*#__PURE__*/function () {
@@ -235,10 +238,14 @@ var VtxWangEditor = exports.VtxWangEditor = function VtxWangEditor(props) {
       var newValue = editor.getHtml() || undefined;
       // 对输出内容也进行安全过滤
       var processedValue = enableSanitization && newValue !== undefined ? (0, _wangEditorUtil.sanitizeHtml)(newValue) : newValue;
-      console.log('编辑器内容变化，处理前内容:', newValue);
-      console.log('编辑器内容变化，处理后内容:', processedValue);
-      if (processedValue !== value) {
-        onChange(processedValue);
+      // console.log('编辑器内容变化，处理前内容:', newValue);
+      // console.log('编辑器内容变化，处理后内容:', processedValue);
+      if (processedValue !== valueRef.current) {
+        if (processedValue === undefined) {
+          onChange('');
+        } else {
+          onChange(processedValue);
+        }
       }
     } catch (error) {
       handleError(new Error('编辑器内容处理失败: ' + error.message));
@@ -273,7 +280,6 @@ var VtxWangEditor = exports.VtxWangEditor = function VtxWangEditor(props) {
         },
         customInsert: function customInsert(res, insertFn) {
           try {
-            console.log(res, insertFn);
             // res 即服务端的返回结果
             // 从 res 中找到 url alt href ，然后插入图片
             if (res.result == 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/components",
-  "version": "4.0.0-beta.25",
+  "version": "4.0.0-beta.27",
   "description": "React components for Vortex",
   "keywords": [
     "react",