@luck-design-biz/luckda 1.0.1-12 → 1.0.1-14

package/es/components/LDActions/index.less

@@ -1,3 +1,5 @@
+@import '~@luck-helper/ui-design/es/style/themes/default.less';
+
 @spanDefault: #262626;
 @spanPrimary: var(--ant-primary-color);
 @spanDanger: #ff4d4f;
@@ -16,7 +18,7 @@
   }
 
   button.default {
-    background-color: white;
+    background-color: @component-background;
   }
   span.default {
     color: @spanDefault;

package/es/components/LdCard/index.js

@@ -1,11 +1,13 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "loading", "wrapperRef", "hasMore", "list", "detail", "params", "doQuery", "onQuery", "unclosableSet", "formatDataSource", "resultSet", "cardConfig", "cardActions", "onOperationsClick", "readOnly", "batchOperations", "readFilter"],
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "loading", "wrapperRef", "hasMore", "list", "detail", "params", "doQuery", "onQuery", "unclosableSet", "formatDataSource", "resultSet", "cardConfig", "maxActionsCount", "cardActions", "onOperationsClick", "readOnly", "batchOperations", "readFilter", "wrapper", "wrapperProps", "draggable", "onDrop", "onMount", "onUnmount"],
   _excluded2 = ["ldId", "moduleCode", "suppressInit", "overModel", "afterQuery"];
-import React, { forwardRef, useImperativeHandle, useRef, useEffect } from 'react';
+import React, { forwardRef, useImperativeHandle, useRef, useEffect, useLayoutEffect } from 'react';
 import { getDvaApp } from 'umi';
+import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import { Icon, Tooltip } from 'luck-design/antd';
 import { ResultSet, PermissionUtil } from 'luck-design';
@@ -16,37 +18,92 @@ import ldBuilder from "../../helper/ldBuilder";
 import { CardList, Card } from '@luck-design-biz/base/List';
 import { formatMessage } from '@luck-design-biz/base/utils';
 import { build } from '@luck-design-biz/base/Component';
-var LdCard = function LdCard(_ref) {
-  var columns = _ref.columns,
-    resources = _ref.resources,
-    actions = _ref.actions,
-    doAction = _ref.doAction,
-    afterInit = _ref.afterInit,
-    namespace = _ref.namespace,
-    loading = _ref.loading,
-    wrapperRef = _ref.wrapperRef,
-    hasMore = _ref.hasMore,
-    list = _ref.list,
-    detail = _ref.detail,
-    params = _ref.params,
-    doQuery = _ref.doQuery,
-    onQuery = _ref.onQuery,
-    unclosableSet = _ref.unclosableSet,
-    formatDataSource = _ref.formatDataSource,
-    resultSet = _ref.resultSet,
-    cardConfig = _ref.cardConfig,
-    cardActions = _ref.cardActions,
+var Action = function Action(_ref) {
+  var data = _ref.data,
+    action = _ref.action,
     onOperationsClick = _ref.onOperationsClick,
-    readOnly = _ref.readOnly,
-    batchOperations = _ref.batchOperations,
-    readFilter = _ref.readFilter,
-    props = _objectWithoutProperties(_ref, _excluded);
+    _ref$inPopover = _ref.inPopover,
+    inPopover = _ref$inPopover === void 0 ? false : _ref$inPopover;
+  var style = _objectSpread({
+    fontSize: '18px'
+  }, action.style);
+  if (action.disabled) style.color = 'var(--luck-color-disabled)';
+  if (inPopover) style = _objectSpread(_objectSpread({}, style), {}, {
+    display: 'flex',
+    cursor: 'pointer'
+  });
+  if (action.render) return /*#__PURE__*/React.createElement("div", {
+    style: style
+  }, action.render());
+  var renderDiv = function renderDiv(_title) {
+    return /*#__PURE__*/React.createElement("div", {
+      style: style,
+      onClick: function onClick(e) {
+        e.stopPropagation();
+        action.onClick ? action.onClick(data, e) : onOperationsClick(action.key, data, e);
+      }
+    }, action.iconNode ? action.iconNode : /*#__PURE__*/React.createElement(Icon, {
+      type: action.icon
+    }), _title && /*#__PURE__*/React.createElement("span", {
+      style: {
+        marginLeft: '4px',
+        fontSize: '12px'
+      }
+    }, _title));
+  };
+  if (inPopover) return renderDiv(action.title);
+  return /*#__PURE__*/React.createElement(Tooltip, {
+    placement: "top",
+    title: action.title
+  }, renderDiv());
+};
+var LdCard = function LdCard(_ref2) {
+  var columns = _ref2.columns,
+    resources = _ref2.resources,
+    actions = _ref2.actions,
+    doAction = _ref2.doAction,
+    afterInit = _ref2.afterInit,
+    namespace = _ref2.namespace,
+    loading = _ref2.loading,
+    wrapperRef = _ref2.wrapperRef,
+    hasMore = _ref2.hasMore,
+    list = _ref2.list,
+    detail = _ref2.detail,
+    params = _ref2.params,
+    doQuery = _ref2.doQuery,
+    onQuery = _ref2.onQuery,
+    unclosableSet = _ref2.unclosableSet,
+    formatDataSource = _ref2.formatDataSource,
+    resultSet = _ref2.resultSet,
+    cardConfig = _ref2.cardConfig,
+    maxActionsCount = _ref2.maxActionsCount,
+    cardActions = _ref2.cardActions,
+    onOperationsClick = _ref2.onOperationsClick,
+    readOnly = _ref2.readOnly,
+    batchOperations = _ref2.batchOperations,
+    readFilter = _ref2.readFilter,
+    wrapper = _ref2.wrapper,
+    wrapperProps = _ref2.wrapperProps,
+    draggable = _ref2.draggable,
+    onDrop = _ref2.onDrop,
+    onMount = _ref2.onMount,
+    onUnmount = _ref2.onUnmount,
+    props = _objectWithoutProperties(_ref2, _excluded);
   var cardRef = useRef(null);
   useEffect(function () {
     readFilter && readFilter(params);
   }, [params]);
   useImperativeHandle(wrapperRef, function () {
     return _objectSpread(_objectSpread({}, cardRef.current), {}, {
+      getProps: function getProps() {
+        var _getDvaApp;
+        return {
+          apiUrl: (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 || (_getDvaApp = _getDvaApp._store.getState()[namespace]) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp.apiUrl,
+          filter: {
+            params: params
+          }
+        };
+      },
       onLdQuery: function onLdQuery() {
         var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         doQuery({
@@ -56,6 +113,14 @@ var LdCard = function LdCard(_ref) {
       }
     });
   });
+  useLayoutEffect(function () {
+    onMount && onMount({
+      params: params
+    });
+    return function () {
+      onUnmount && onUnmount();
+    };
+  }, []);
   var _batchOperations = useCreation(function () {
     return (batchOperations || []).map(function (i) {
       return _objectSpread(_objectSpread({}, i), {}, {
@@ -66,6 +131,7 @@ var LdCard = function LdCard(_ref) {
   var renderCard = useMemoizedFn(function (item) {
     return /*#__PURE__*/React.createElement(Card, _extends({}, cardConfig, {
       dataSource: item,
+      showDragHandle: draggable,
       operates: readOnly ? [] : item['__infuse_serial__'] || resources,
       onCardClick: function onCardClick(_item, e) {
         return onOperationsClick && onOperationsClick('read', _item, e);
@@ -73,33 +139,51 @@ var LdCard = function LdCard(_ref) {
       onCardDelete: function onCardDelete(_item, e) {
         return onOperationsClick && onOperationsClick('delete', _item, e);
       },
-      actions: PermissionUtil(cardActions.map(function (i) {
-        return i.render ? /*#__PURE__*/React.createElement("div", {
-          key: i.key,
-          wanted: i.resource || 'virtual',
-          style: {
-            fontSize: '18px'
-          }
-        }, i.render()) : /*#__PURE__*/React.createElement(Tooltip, {
-          key: i.key,
-          wanted: i.resource || 'virtual',
-          placement: "top",
-          title: i.title
-        }, /*#__PURE__*/React.createElement("div", {
-          style: {
-            fontSize: '18px'
-          },
-          onClick: function onClick(e) {
-            e.stopPropagation();
-            i.onClick ? i.onClick(item, e) : onOperationsClick(i.key, item, e);
-          }
-        }, /*#__PURE__*/React.createElement(Icon, {
-          type: i.icon
-        })));
-      }), readOnly ? [] : [].concat(_toConsumableArray(item['__infuse_serial__'] || resources), ['virtual']))
+      actions: PermissionUtil(cardActions.map(function (action) {
+        return /*#__PURE__*/React.createElement(Action, {
+          key: action.key,
+          wanted: action.resource || 'virtual',
+          data: item,
+          action: action
+        });
+      }), readOnly ? [] : [].concat(_toConsumableArray(item['__infuse_serial__'] || resources), ['virtual']), false, 'right', maxActionsCount)
     }));
   });
-  return /*#__PURE__*/React.createElement(React.Fragment, null, difference(Object.keys(params), resultSet.invisibleSet || []).length > 0 && /*#__PURE__*/React.createElement(ResultSet, _extends({
+  var handleDragEnd = useMemoizedFn(function (evt) {
+    var oldIndex = evt.oldIndex,
+      newIndex = evt.newIndex;
+    var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
+    var dragNodeProps = detail[list[oldIndex]];
+    var targetNodeProps = detail[list[newIndex]];
+    if (onDrop) onDrop({
+      dragNodeProps: dragNodeProps,
+      targetNodeProps: targetNodeProps,
+      evt: evt
+    });else {
+      doAction('drag', {
+        get: {
+          datasetCode: props.dataSetKey
+        },
+        post: {
+          fromId: dragNodeProps[PRIMARY],
+          toId: targetNodeProps[PRIMARY]
+        }
+      }, {
+        showConfirm: false,
+        callback: function callback(success) {
+          return success && doQuery();
+        }
+      });
+    }
+  });
+  var _ref3 = wrapperProps || {},
+    className = _ref3.className,
+    _wrapperProps = _ref3._wrapperProps;
+  return /*#__PURE__*/React.createElement("div", _extends({
+    ref: wrapper
+  }, _wrapperProps, {
+    className: classNames('luck-card-list', _defineProperty({}, className, !!className))
+  }), difference(Object.keys(params), resultSet.invisibleSet || []).length > 0 && /*#__PURE__*/React.createElement(ResultSet, _extends({
     set: params,
     onQuery: onQuery
   }, resultSet, {
@@ -107,14 +191,16 @@ var LdCard = function LdCard(_ref) {
   })), /*#__PURE__*/React.createElement(CardList, _extends({
     col: 4,
     loading: loading,
-    renderCard: renderCard
+    renderCard: renderCard,
+    onDragEnd: handleDragEnd
   }, props, {
     operates: [].concat(_toConsumableArray(resources), ['virtual']),
     modelName: namespace,
     dataSource: formatDataSource(list, detail),
     hasMore: !!hasMore,
     batchOperations: _batchOperations,
-    ref: cardRef
+    ref: cardRef,
+    draggable: draggable
   })));
 };
 var ForwardLdCard = /*#__PURE__*/forwardRef(function (props, ref) {
@@ -122,23 +208,23 @@ var ForwardLdCard = /*#__PURE__*/forwardRef(function (props, ref) {
     wrapperRef: ref
   }, props));
 });
-var LdIndex = function LdIndex(_ref2) {
-  var namespace = _ref2.ldId,
-    moduleCode = _ref2.moduleCode,
-    suppressInit = _ref2.suppressInit,
-    overModel = _ref2.overModel,
-    afterQuery = _ref2.afterQuery,
-    props = _objectWithoutProperties(_ref2, _excluded2);
+var LdIndex = function LdIndex(_ref4) {
+  var namespace = _ref4.ldId,
+    moduleCode = _ref4.moduleCode,
+    suppressInit = _ref4.suppressInit,
+    overModel = _ref4.overModel,
+    afterQuery = _ref4.afterQuery,
+    props = _objectWithoutProperties(_ref4, _excluded2);
   if (includes(props.isTree, props.dataSetKey)) return formatMessage({
     id: 'luckda.ldCard.notTres',
     label: '此数据集为树形数据集，请选择非树形数据集'
   });
   var Component = useCreation(function () {
-    var _getDvaApp, _getDvaApp2;
-    (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 || _getDvaApp.unmodel(namespace);
-    if (!((_getDvaApp2 = getDvaApp()) !== null && _getDvaApp2 !== void 0 && _getDvaApp2._store.getState()[namespace])) {
-      var _getDvaApp3;
-      (_getDvaApp3 = getDvaApp()) === null || _getDvaApp3 === void 0 || _getDvaApp3.model(createModel(namespace, _objectSpread(_objectSpread({
+    var _getDvaApp2, _getDvaApp3;
+    (_getDvaApp2 = getDvaApp()) === null || _getDvaApp2 === void 0 || _getDvaApp2.unmodel(namespace);
+    if (!((_getDvaApp3 = getDvaApp()) !== null && _getDvaApp3 !== void 0 && _getDvaApp3._store.getState()[namespace])) {
+      var _getDvaApp4;
+      (_getDvaApp4 = getDvaApp()) === null || _getDvaApp4 === void 0 || _getDvaApp4.model(createModel(namespace, _objectSpread(_objectSpread({
         isFlow: !!props.isFlow
       }, overModel), {}, {
         dataSetKey: props.dataSetKey,
@@ -190,7 +276,8 @@ Index.defaultProps = {
   },
   cardActions: [],
   overModel: {},
-  cardKey: window.appConfig.constraintKeys.PRIMARY
+  cardKey: window.appConfig.constraintKeys.PRIMARY,
+  maxActionsCount: 3
 };
 export default /*#__PURE__*/forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement(Index, _extends({

package/es/components/LdTree/index.js

@@ -4,7 +4,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["columns", "resources", "actions", "doAction", "wrapperRef", "ldId", "dataSetKey", "defaultParmas", "moduleCode", "readOnly", "title", "rowKey", "treeNodeTitle", "unselectableNodes", "rightMenus", "defaultExpandDeep", "draggable", "onDrop", "className", "treeClassName", "rootAdd", "suppressInit", "afterQuery", "afterInit", "isTree", "service", "dataToTreeFormat", "boxRef", "doubleClickExpand", "onNodeDoubleClick", "width", "height", "treeNodeCheckable", "treeNodeDisableCheckbox", "treeNodeDisable", "treeNodeIcon", "asyncLoad", "parentKey", "onMount", "onUnmount", "onDataSetChange", "onTreeNodeRender", "onlyRoot"],
+var _excluded = ["columns", "resources", "actions", "doAction", "wrapperRef", "ldId", "dataSetKey", "defaultParmas", "moduleCode", "readOnly", "title", "rowKey", "treeNodeTitle", "unselectableNodes", "rightMenus", "defaultExpandDeep", "draggable", "onDrop", "className", "treeClassName", "rootAdd", "suppressInit", "afterQuery", "afterInit", "isTree", "service", "dataToTreeFormat", "wrapper", "wrapperProps", "doubleClickExpand", "onNodeDoubleClick", "width", "height", "treeNodeCheckable", "treeNodeDisableCheckbox", "treeNodeDisable", "treeNodeIcon", "asyncLoad", "parentKey", "onMount", "onUnmount", "onDataSetChange", "onTreeNodeRender", "onlyRoot"],
   _excluded2 = ["0"],
   _excluded3 = ["onClick"];
 import React, { useState, useRef, useImperativeHandle, forwardRef, useLayoutEffect } from 'react';
@@ -16,7 +16,7 @@ import { Icon, Popover } from 'luck-design/antd';
 import { LuckTree } from 'luck-design';
 import { formatMessage, dataToTree, dragTreeData } from '@luck-design-biz/base/utils';
 import { TreeBox } from '@luck-design-biz/base';
-import ldBuilder from "../../helper/ldBuilder";
+import ldBuilder, { ErrorWrapper } from "../../helper/ldBuilder";
 import { behaviorCall } from "../../utils";
 import styles from "./index.less";
 var _window$appConfig$con = window.appConfig.constraintKeys,
@@ -59,7 +59,8 @@ var LdTree = function LdTree(_ref) {
     isTree = _ref.isTree,
     service = _ref.service,
     dataToTreeFormat = _ref.dataToTreeFormat,
-    boxRef = _ref.boxRef,
+    wrapper = _ref.wrapper,
+    wrapperProps = _ref.wrapperProps,
     doubleClickExpand = _ref.doubleClickExpand,
     onNodeDoubleClick = _ref.onNodeDoubleClick,
     width = _ref.width,
@@ -76,10 +77,14 @@ var LdTree = function LdTree(_ref) {
     onTreeNodeRender = _ref.onTreeNodeRender,
     onlyRoot = _ref.onlyRoot,
     props = _objectWithoutProperties(_ref, _excluded);
-  if (!includes(isTree, dataSetKey)) return formatMessage({
+  if (!includes(isTree, dataSetKey)) return /*#__PURE__*/React.createElement(ErrorWrapper, {
+    ref: wrapper,
+    className: className,
+    style: props.style
+  }, formatMessage({
     id: 'luckda.ldTree.notTrees',
     label: '此数据集非树形数据集，请选择树形数据集'
-  });
+  }));
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     dataSource = _useState2[0],
@@ -319,19 +324,20 @@ var LdTree = function LdTree(_ref) {
       loadData: onLoadData
     } : {};
   }, []);
-  return /*#__PURE__*/React.createElement(TreeBox, {
+  return /*#__PURE__*/React.createElement(TreeBox, _extends({
     suppressTitle: !title,
     title: title,
     loading: loading,
     id: ldId,
     onAdd: onAdd,
     className: className,
-    ref: boxRef,
+    ref: wrapper
+  }, wrapperProps, {
     style: {
       width: width,
       height: height
     }
-  }, dataSource && /*#__PURE__*/React.createElement(LuckTree, _extends({
+  }), dataSource && /*#__PURE__*/React.createElement(LuckTree, _extends({
     blockNode: true,
     className: classNames(styles.tree, _defineProperty({}, className, !!treeClassName)),
     draggable: !readOnly && draggable,

package/es/components/LdTree/index.less

@@ -1,3 +1,5 @@
+@import '~@luck-helper/ui-design/es/style/themes/default.less';
+
 .tree {
   .nodeTitle {
     display: flex;

package/es/helper/ldBuilder.js

@@ -3,7 +3,7 @@ import React, { useContext } from 'react';
 import styled from 'styled-components';
 import { LuckDaContext } from "../components/Builder";
 import { formatMessage } from '@luck-design-biz/base/utils';
-var ErrorWrapper = styled.span.withConfig({
+export var ErrorWrapper = styled.span.withConfig({
   displayName: "ErrorWrapper",
   componentId: "luckda-6530__sc-ek28r3-0"
 })(["display:inline-block;width:100%;height:auto;padding:24px 16px;color:#ff4d4f;"]);

package/es/locales/zh-CN.js

@@ -1,6 +1,8 @@
 export default {
   "luckda.lowcode.view.lc-components.label.all": "全部",
   "luckda.lowcode.painter.import": "导入",
+  "luckda.lowcode.painter.components.fullscreen-exit.tip": "退出全屏",
+  "luckda.lowcode.painter.components.fullscreen.tip": "全屏",
   "lc.form.validator.maxLength": "字数不得超过",
   "lc.form.validator.textNum": "个字符",
   "lc.form.validator.numberBelowMin": "低于最小值",
@@ -182,6 +184,7 @@ export default {
   "luckda.lowcode.painter.panel-section.actionEditor.destroy": "毁灭",
   "luckda.lowcode.painter.panel-section.actionEditor.name": "名称",
   "luckda.lowcode.painter.panel-section.actionEditor.name.placeholder": "请输入行为名称",
+  "luckda.lowcode.painter.panel-section.actionEditor.icon": "图标",
   "luckda.lowcode.painter.panel-section.actionEditor.serial": "资源串",
   "luckda.lowcode.painter.panel-section.actionEditor.serialEffect": "越权效果",
   "luckda.lowcode.painter.panel-section.actionEditor.riskLevel": "风险等级",
@@ -268,6 +271,5 @@ export default {
   "luckda.lowcode.painter.panel-section.fieldsSetting.checkRules.message.verifyType": "请选择校验规则",
   "luckda.lowcode.painter.panel-section.fieldsSetting.checkRules.errorMsg": "错误提示",
   "luckda.lowcode.painter.panel-section.fieldsSetting.checkRules.message.errorMsg": "请输入错误提示",
-  "luckda.lowcode.painter.panel-section.fieldsSetting.checkRules.logic": "校验逻辑",
-  "luckda.lowcode.painter.components.fullscreen.tip": "全屏"
+  "luckda.lowcode.painter.panel-section.fieldsSetting.checkRules.logic": "校验逻辑"
 };

package/es/lowcode/engine/meta/cardlist.props.default.json

@@ -5,16 +5,36 @@
   "icon": "icon-cardlist",
   "group": "advance",
   "groupName": "高级",
-  "hidden": true,
   "order": 1,
   "autoLoad": true,
   "readOnly": false,
-  "isFlow": false,
-  "defaultPageSize": 30,
-  "actionTitle": "操作列",
-  "actionWidth": 100,
-  "actionHidden": false,
-  "maxWebShownActionCount": 2,
+  "draggable": false,
+  "col": 4,
+  "pagination": true,
+  "pageSize": 40,
+  "nocardBoxborder": false,
+  "showAvatar": true,
+  "showTitle": true,
+  "showDesc": true,
+  "describeLines": 2,
+  "showAddCard": false,
+  "addCardHeight": 240,
+  "addCardWords": "新建",
+  "topActionGroup": {
+    "display": "button",
+    "max": 2,
+    "moreText": "操作",
+    "todoList": []
+  },
+  "rowSelection": false,
+  "batchOperations": {
+    "todoList": []
+  },
+  "suppressActions": false,
+  "actions": {
+    "max": 3,
+    "todoList": []
+  },
   "advance": {
     "events": {}
   }