@luck-design-biz/luckda 1.0.1 → 1.0.2

package/es/lowcode/view/lc-components/Image/meta.json

@@ -9,7 +9,7 @@
   "props": [
     {
       "key": "id",
-      "desc": "唯一标识",
+      "name": "唯一标识",
       "type": "string",
       "disabled": true
     },
@@ -17,7 +17,7 @@
       "key": "src",
       "name": "图片地址",
       "desc": "图片地址",
-      "type": "_ImageUploder"
+      "type": "string"
     },
     {
       "key": "width",
@@ -26,6 +26,13 @@
       "type": "number",
       "default": 350
     },
+    {
+      "key": "autoWidth",
+      "name": "宽度自适应",
+      "desc": "是否图片宽度自适应",
+      "type": "switch",
+      "default": false
+    },
     {
       "key": "height",
       "name": "高度",
@@ -34,10 +41,10 @@
       "default": 200
     },
     {
-      "key": "autoWidth",
-      "name": "宽度自适应",
-      "desc": "是否图片宽度自适应",
-      "type": "boolean",
+      "key": "autoHeight",
+      "name": "高度自适应",
+      "desc": "是否图片高度自适应",
+      "type": "switch",
       "default": false
     },
     {
@@ -47,16 +54,16 @@
       "type": "select",
       "options": [
         {
-          "label": "铺满",
-          "value": "fill"
+          "label": "铺满（Cover）",
+          "value": "cover"
         },
         {
-          "label": "适合",
-          "value": "fit"
+          "label": "适合（Contain）",
+          "value": "contain"
         },
         {
-          "label": "拉伸",
-          "value": "Stretch"
+          "label": "拉伸（Fill）",
+          "value": "fill"
         }
       ],
       "default": "fill"
@@ -65,8 +72,36 @@
       "key": "roundRadios",
       "name": "圆角",
       "desc": "图片四周圆角大小,可设置“0 1px 2px 3px",
-      "type": "string",
-      "default": "0"
+      "type": "select",
+      "options": [
+        {
+          "label": "大（16px）",
+          "value": "16px"
+        },
+        {
+          "label": "中（8px）",
+          "value": "8px"
+        },
+        {
+          "label": "小（4px）",
+          "value": "4px"
+        },
+        {
+          "label": "无（0px）",
+          "value": "0px"
+        },
+        {
+          "label": "自定义",
+          "value": ""
+        }
+      ],
+      "default": ""
+    },
+    {
+      "key": "borderRadios",
+      "name": "圆角大小",
+      "desc": "自定义圆角大小",
+      "type": "string"
     },
     {
       "key": "title",
@@ -84,7 +119,7 @@
       "key": "preview",
       "name": "开启图片预览",
       "desc": "是否开启点击打开图片预览",
-      "type": "boolean",
+      "type": "switch",
       "default": false
     }
   ],
@@ -106,7 +141,7 @@
       {
         "key": "onClick",
         "name": "点击事件",
-        "desc": "点击文本时，执行方法",
+        "desc": "点击图片时，执行方法",
         "func": "(e)=>{\n\t\n}"
       }
     ]

package/es/lowcode/view/lc-components/Link/index.js

@@ -1,14 +1,53 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["id"];
-import React, { useRef } from 'react';
+var _excluded = ["id", "css", "onClick", "advance"];
+import React, { useEffect, useRef } from 'react';
 import { useMemoizedFn } from 'ahooks';
 import { omitBadProps } from "../../../engine/tools/helper";
 import defaultMeta from "../../../engine/meta/link.props.default.json";
 import Wrapper from "../Wrapper";
+import styled from 'styled-components';
+import { useContext } from "../../../engine/provider/ContextProvider";
+import { RUNTIME } from "../../../constants";
+var StyledLink = styled.a.withConfig({
+  displayName: "StyledLink",
+  componentId: "luckda-6530__sc-13gzda1-0"
+})(["display:", ";max-width:", ";white-space:", ";overflow:", ";text-overflow:", ";", ";"], function (props) {
+  return props.textOverflow && 'inline-block';
+}, function (props) {
+  return props.textOverflow && '100%';
+}, function (props) {
+  return props.textOverflow && 'nowrap';
+}, function (props) {
+  return props.textOverflow && 'hidden';
+}, function (props) {
+  return props.textOverflow && 'ellipsis';
+}, function (props) {
+  return props.$css;
+});
 var LCLink = function LCLink(_ref) {
   var id = _ref.id,
+    css = _ref.css,
+    onClick = _ref.onClick,
+    advance = _ref.advance,
     props = _objectWithoutProperties(_ref, _excluded);
   var ref = useRef();
+  var ctx = useContext();
+  useEffect(function () {
+    ctx.doAction(advance.events.onMount);
+    return function () {
+      return ctx.doAction(advance.events.onUnmount);
+    };
+  }, []);
+  var handleClick = useMemoizedFn(function (e) {
+    if (onClick) {
+      onClick(e);
+      return;
+    }
+    ctx.doAction(advance.events.onClick, {
+      e: e
+    });
+  });
   var getTargetDom = useMemoizedFn(function () {
     return ref.current;
   });
@@ -16,9 +55,18 @@ var LCLink = function LCLink(_ref) {
     id: id,
     displayName: "Link",
     getTargetDom: getTargetDom
-  }, /*#__PURE__*/React.createElement("div", {
-    ref: ref
-  }, "LCLink"));
+  }, /*#__PURE__*/React.createElement(StyledLink, _extends({
+    $css: css
+  }, props, {
+    ref: ref,
+    href: "".concat(props.url, "?").concat(props.params),
+    target: props.isBlank ? '_blank' : '_self',
+    title: props.textOverflow && props.content,
+    onClick: function onClick(e) {
+      handleClick(e);
+      ctx.runtime === RUNTIME.DESIGN && e.preventDefault();
+    }
+  }), props.content));
 };
 LCLink.defaultProps = omitBadProps(defaultMeta);
 export default LCLink;

package/es/lowcode/view/lc-components/Link/index.less

@@ -0,0 +1,15 @@
+.alink {
+  display: inline-block;
+  max-width: 100%;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+
+  a {
+    display: inline-block;
+    max-width: 100%;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}

package/es/lowcode/view/lc-components/Link/meta.json

@@ -9,7 +9,7 @@
   "props": [
     {
       "key": "id",
-      "desc": "唯一标识",
+      "name": "唯一标识",
       "type": "string",
       "disabled": true
     },
@@ -22,8 +22,8 @@
     {
       "key": "textOverflow",
       "name": "单行截断",
-      "desc": "文字超过一行，使甲...显示；开后此项后，同时会显示html标签的title",
-      "type": "boolean",
+      "desc": "文字超过一行，使用...显示；开后此项后，同时会显示html标签的title",
+      "type": "switch",
       "default": false
     },
     {
@@ -50,16 +50,16 @@
       "type": "string"
     },
     {
-      "key": "isLayer",
-      "name": "弹窗打开",
-      "desc": "是否以弹窗形式打开",
-      "type": "boolean",
-      "default": false
+      "key": "isBlank",
+      "name": "新开页面",
+      "desc": "是否新开页面",
+      "type": "switch",
+      "default": true
     },
     {
       "key": "params",
       "name": "携带参数",
-      "desc": "超链的携带参数",
+      "desc": "超链的携带参数，key=value形式，多个参数中间用&拼接，例如：pageNo=1&pageSize=20",
       "type": "string"
     },
     {

package/es/lowcode/view/lc-components/Table/index.js

@@ -338,12 +338,13 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
           resource: action.serial
         };
       }),
-      onBatchOperationsClick: function onBatchOperationsClick(key, selectedRows) {
+      onBatchOperationsClick: function onBatchOperationsClick(key, selectedRows, cb) {
         var todoListById = keyBy(bantchActions.todoList, 'id');
         var doAction = function doAction() {
           ctx.doAction(todoListById[key].actionPool, {
             key: key,
             selectedRows: selectedRows,
+            cb: cb,
             datasetCode: dataset.code
           });
         };
@@ -447,12 +448,12 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
     }
     return resultComp;
   }, [topActionGroup, impexp]);
-  var renderFilterArea = useMemoizedFn(function () {
+  var renderFilterArea = useCallback(function () {
     return topFilter ? /*#__PURE__*/React.createElement(TopFilter, {
       filter: topFilter,
       instance: instanceRef
     }) : null;
-  });
+  }, [topFilter]);
   var _wrapperProps = useCreation(function () {
     return _defineProperty({
       id: id
@@ -463,9 +464,7 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
     var condition = _zebra !== null && _zebra !== void 0 && _zebra.condition ? executeCode(ctx, _zebra.condition, ['params'], params) : _zebra && params.node.rowIndex % 2 === 0;
     return condition ? {
       'background-color': _zebra.color || _zebra
-    } : {
-      'background-color': '#fff'
-    };
+    } : {};
   });
   var _readFilter = useMemoizedFn(function (params, filters) {
     ctx.doAction(advance.events.onFilterChanged, {

package/es/lowcode/view/lc-components/Table/meta.json

@@ -168,7 +168,7 @@
             "default": {
               "todoList": []
             },
-            "defaultCode": "function onBatchOperationsClick(key, selectedRows) {\n\n}",
+            "defaultCode": "function onBatchOperationsClick(key, selectedRows, cb) {\n\n}",
             "suppressDisplay": true,
             "suppressMax": true,
             "suppressMore": true,

package/es/lowcode/view/lc-components/Tabs/FunctionDesign.js

@@ -6,9 +6,10 @@ var _excluded = ["children", "id", "items"];
 import React, { useEffect } from 'react';
 import Index from "./index";
 import { useCreation } from 'ahooks';
-import { differenceBy } from 'lodash';
+import { differenceBy, cloneDeep } from 'lodash';
 import { suid } from '@luck-design-biz/base/utils';
-import { useContext, useGet, addNode } from "../../../engine/provider/ContextProvider";
+import { useContext, useGet, addNode, modifyNode } from "../../../engine/provider/ContextProvider";
+import { Action, ActionSide } from "../../../painter/components/DragDrop/DragDropContext";
 import boxDefaultMeta from "../../../engine/meta/box.props.default.json";
 var FunctionDesign = function FunctionDesign(_ref) {
   var children = _ref.children,
@@ -58,13 +59,48 @@ var FunctionDesign = function FunctionDesign(_ref) {
         });
       }
     }).watch();
+    var cdeid = ctx.$subscriber(ctx.topics.COMPONENT_DRAG_END).on(function (_ref4) {
+      var toId = _ref4.id,
+        fromId = _ref4.fromId,
+        action = _ref4.action,
+        actionSide = _ref4.actionSide,
+        vaild = _ref4.vaild;
+      if (!vaild || action === Action.ADD) return;
+      var fromTabId = current[fromId].props.tabId;
+      var toTabId = current[toId].props.tabId;
+      var fromIndex = items.findIndex(function (_ref5) {
+        var _tabId = _ref5.id;
+        return _tabId === fromTabId;
+      });
+      var _items = cloneDeep(items);
+      var _items$splice = _items.splice(fromIndex, 1),
+        _items$splice2 = _slicedToArray(_items$splice, 1),
+        _tab = _items$splice2[0];
+      var toIndex = _items.findIndex(function (_ref6) {
+        var _tabId = _ref6.id;
+        return _tabId === toTabId;
+      });
+      if (actionSide === ActionSide.LEFT) {
+        _items.splice(toIndex, 0, _tab);
+      } else if (actionSide === ActionSide.RIGHT) {
+        _items.splice(toIndex + 1, 0, _tab);
+      }
+      modifyNode(id, {
+        items: _items
+      });
+    }).watch();
     return function () {
-      return ctx.$unsubscriber(ctx.topics.COMPONENT_MODIFY, cmid);
+      ctx.$unsubscriber(ctx.topics.COMPONENT_DRAG_END, cdeid);
+      ctx.$unsubscriber(ctx.topics.COMPONENT_MODIFY, cmid);
     };
   }, [current.children]);
   return /*#__PURE__*/React.createElement(Index, _extends({
     id: id,
-    items: items
+    items: items.map(function (_item) {
+      return _objectSpread(_objectSpread({}, _item), {}, {
+        destory: false
+      });
+    })
   }, props), children);
 };
 export default FunctionDesign;

package/es/lowcode/view/lc-components/Tabs/index.js

@@ -88,7 +88,7 @@ var LCTabs = function LCTabs(_ref) {
     return /*#__PURE__*/React.createElement(Tabs.TabPane, {
       tab: item.name,
       key: item.id,
-      forceRender: item.destory
+      forceRender: !item.destory
     }, children === null || children === void 0 ? void 0 : children.find(function (child) {
       return child.props.tabId === item.id;
     }));

package/es/lowcode/view/lc-components/Tabs/meta.json

@@ -23,7 +23,7 @@
           "id": "tab_lvwdncx1",
           "name": "标签项",
           "active": true,
-          "destory": false,
+          "destory": true,
           "serial": null,
           "serialEffect": "hidden"
         }

package/es/lowcode/view/lc-components/Tree/index.js

@@ -2,8 +2,8 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["id", "wrapperRef", "className", "dataset", "width", "height", "showLine", "defaultExpandDeep", "actions", "editable", "showRootAdd", "onlyRoot", "rootAddSetting", "doubleClickExpand", "onDoubleClick", "treeNodeCheckable", "treeNodeDisableCheckbox", "treeNodeDisable", "onTreeNodeRender", "treeNodeIcon", "advance", "cancelSelect", "defaultSelect"];
-import React, { useRef, useImperativeHandle, useState, useEffect } from 'react';
+var _excluded = ["id", "className", "dataset", "width", "height", "showLine", "defaultExpandDeep", "actions", "editable", "showRootAdd", "onlyRoot", "rootAddSetting", "doubleClickExpand", "onDoubleClick", "treeNodeCheckable", "treeNodeDisableCheckbox", "treeNodeDisable", "onTreeNodeRender", "treeNodeIcon", "advance", "cancelSelect", "defaultSelect"];
+import React, { useRef, useImperativeHandle, useState, forwardRef } from 'react';
 import PropTypes from 'prop-types';
 import { useMemoizedFn, useCreation } from 'ahooks';
 import classNames from 'classnames';
@@ -13,13 +13,14 @@ import { suid } from '@luck-design-biz/base/utils';
 import { useContext } from "../../../engine/provider/ContextProvider";
 import Wrapper from "../Wrapper";
 import { LdTree } from "../../../../index";
+import useCombinedRefs from "../../../engine/tools/useCombinedRefs";
 import { omitBadProps, executeCode } from "../../../engine/tools/helper";
 import defaultMeta from "../../../engine/meta/tree.props.default.json";
+import { LC_COMPONENT_UNIT_KEY, LC_COMPONENT_UNIT } from "../../../constants";
 import styles from "./index.less";
 var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
-var LCTree = function LCTree(_ref) {
+var LCTree = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var id = _ref.id,
-    wrapperRef = _ref.wrapperRef,
     className = _ref.className,
     dataset = _ref.dataset,
     width = _ref.width,
@@ -43,20 +44,20 @@ var LCTree = function LCTree(_ref) {
     defaultSelect = _ref.defaultSelect,
     props = _objectWithoutProperties(_ref, _excluded);
   var ctx = useContext();
-  var boxRef = useRef();
   var apiRef = useRef();
-  var treeRef = useRef();
+  var wrapperRef = useRef();
+  var instanceRef = useCombinedRefs(ref);
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     selectedKeys = _useState2[0],
     setSelectedKeys = _useState2[1];
   var getTargetDom = useMemoizedFn(function () {
-    return boxRef.current;
+    return wrapperRef.current;
   });
   useImperativeHandle(apiRef, function () {
     return {
       getInstance: function getInstance() {
-        return treeRef.current;
+        return instanceRef.current;
       }
     };
   });
@@ -141,23 +142,24 @@ var LCTree = function LCTree(_ref) {
       doAction();
     }
   };
+  var _wrapperProps = useCreation(function () {
+    return _defineProperty({
+      id: id
+    }, LC_COMPONENT_UNIT_KEY, LC_COMPONENT_UNIT);
+  }, []);
   return /*#__PURE__*/React.createElement(Wrapper, {
     id: id,
     displayName: "Tree",
     getTargetDom: getTargetDom,
     api: apiRef
-  }, /*#__PURE__*/React.createElement("div", {
-    ref: boxRef,
-    style: {
-      width: width,
-      height: height
-    }
   }, /*#__PURE__*/React.createElement(LdTree, _extends({
-    width: "100%",
-    height: "100%",
+    width: width,
+    height: height,
     id: id,
     ldId: id,
-    ref: treeRef,
+    ref: instanceRef,
+    wrapper: wrapperRef,
+    wrapperProps: _wrapperProps,
     className: classNames(styles['lc-component-tree'], _defineProperty({}, className, !!className)),
     dataSetKey: dataset === null || dataset === void 0 ? void 0 : dataset.code,
     showLine: showLine,
@@ -222,8 +224,8 @@ var LCTree = function LCTree(_ref) {
     selectedKeys: selectedKeys,
     onSelect: handleSelect,
     afterInit: afterInit
-  }, events, props))));
-};
+  }, events, props)));
+});
 LCTree.propTypes = {
   /**
    * @name 唯一标识

package/es/lowcode/view/lc-components/Tree/meta.json

@@ -9,7 +9,7 @@
   "props": [
     {
       "key": "id",
-      "desc": "唯一标识",
+      "name": "唯一标识",
       "type": "string",
       "disabled": true
     },
@@ -193,7 +193,7 @@
       "props": [
         {
           "key": "cancelSelect",
-          "name": "取消选中",
+          "name": "允许取消选中",
           "desc": "是否可以取消选中",
           "type": "switch",
           "default": true

package/es/utils/grid.js

@@ -6,7 +6,7 @@ var _excluded = ["comName", "property"],
   _excluded3 = ["filter", "filterParams"];
 import React from 'react';
 import { getDvaApp } from 'umi';
-import { merge, isNil, isArray, includes, capitalize, isString } from 'lodash';
+import { merge, isNil, isArray, includes, capitalize, isString, isObject } from 'lodash';
 import { Switch, Tag } from 'luck-design/antd';
 import moment from 'moment';
 import UploadGridCell from "../upload/GridCell";
@@ -47,11 +47,11 @@ export function getColumnRender(name, type) {
     case 'complex':
     case 'dict':
       render = function render(text, record) {
-        if (record["".concat(name, "_virtual")]) return record["".concat(name, "_virtual")];
         if (isArray(text)) return text.map(function (i) {
           return i.label;
         }).join(',');
-        if (!isNil(text)) return text.label;
+        if (isObject(text)) return text.label;
+        if (record["".concat(name, "_virtual")]) return record["".concat(name, "_virtual")];
       };
       break;
     case 'switch':

package/lib/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/lib/components/LdAutoForm/index.js

@@ -80,7 +80,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
       var col = columnsObj[key];
       if ((setting === null || setting === void 0 ? void 0 : setting._type) === 'divider') {
         result.push( /*#__PURE__*/_react.default.createElement(_luckDesign.BasicDivider, {
-          title: setting === null || setting === void 0 ? void 0 : setting.fieldAliasName
+          title: setting === null || setting === void 0 ? void 0 : setting.fieldAliasName,
+          key: key
         }));
       } else if (col !== null && col !== void 0 && col.isShowInForm && ((0, _lodash.isNil)(setting) || setting !== null && setting !== void 0 && setting.isShow)) {
         var customFiled = filedsRewrite.find(function (_field) {