@luck-design-biz/luckda 1.0.0-alpha → 1.0.1

package/es/lowcode/painter/components/field-setting/meta/frontRules.js

@@ -5,6 +5,7 @@ export var getFrontRules = function getFrontRules(property) {
     case 'money':
     case 'decimal':
     case 'sint':
+    case 'long':
       rules = [{
         label: '最小值',
         key: 'min',
@@ -47,7 +48,7 @@ export var getFrontRules = function getFrontRules(property) {
   rules.push({
     label: '自定义',
     key: 'rules',
-    defaultCode: "function validator(cValue, rule, value, callback) { \n if(!value) callback('errorMsg'); \n callback(); \n}"
+    defaultCode: "function validator(cValue, rule, value, callback) { \n if(!value) callback('errorMsg'); \n else callback(); \n}"
   });
   return rules;
 };

package/es/lowcode/painter/index.js

@@ -13,6 +13,7 @@ var Painter = function Painter(_ref) {
   var className = _ref.className,
     code = _ref.code;
   return /*#__PURE__*/React.createElement(EventBusProvider, {
+    key: code,
     runtime: RUNTIME.DESIGN
   }, /*#__PURE__*/React.createElement(ContextProvider, {
     code: code

package/es/lowcode/painter/panel-section/BlockEditor/index.js

@@ -1,6 +1,12 @@
 import React from 'react';
 import { useMemoizedFn } from 'ahooks';
-import { Icon } from 'luck-design/antd';
+import { Typography } from 'luck-design/antd';
+import styled from 'styled-components';
+var Paragraph = Typography.Paragraph;
+var BlockIdSpan = styled(Paragraph).withConfig({
+  displayName: "BlockIdSpan",
+  componentId: "luckda-6530__sc-gbohir-0"
+})(["display:inline-block;margin:0;color:#595959;text-decoration:var(--ant-primary-color) wavy underline;cursor:copy;padding:0 4px;"]);
 var BlockEditor = function BlockEditor(_ref) {
   var blockName = _ref.blockName,
     blockId = _ref.blockId,
@@ -11,17 +17,25 @@ var BlockEditor = function BlockEditor(_ref) {
       blockId: blockId
     });
   });
-  return /*#__PURE__*/React.createElement("span", {
+  var handleCopyBlockId = useMemoizedFn(function (e) {
+    e.stopPropagation();
+  });
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
     onClick: handleClick,
     style: next ? {
       color: 'var(--ant-primary-color)',
       cursor: 'pointer'
     } : {}
-  }, blockName || blockId, next && /*#__PURE__*/React.createElement(Icon, {
-    type: "setting",
+  }, blockName, /*#__PURE__*/React.createElement("span", {
+    onClick: handleCopyBlockId
+  }, /*#__PURE__*/React.createElement(BlockIdSpan, {
     style: {
-      marginLeft: 4
+      display: 'inline-block',
+      margin: 0
+    },
+    copyable: {
+      text: blockId
     }
-  }));
+  }, blockId))));
 };
 export default BlockEditor;

package/es/lowcode/painter/panel-section/BlocksEditor/index.js

@@ -43,7 +43,7 @@ var addOptions = [{
   }),
   value: 'blank'
 }];
-var BlockEditor = function BlockEditor(_ref) {
+var BlocksEditor = function BlocksEditor(_ref) {
   var onChange = _ref.onChange,
     nodeId = _ref.nodeId,
     renderPanelItems = _ref.renderPanelItems,
@@ -226,4 +226,4 @@ var BlockEditor = function BlockEditor(_ref) {
     label: '新增区块'
   }))))) : null;
 };
-export default BlockEditor;
+export default BlocksEditor;

package/es/lowcode/painter/panel-section/ComplexPop.js

@@ -0,0 +1,242 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["field", "fieldName", "renderItemRight", "onChange", "sortable", "editable"];
+import React, { useEffect, useState, useLayoutEffect } from 'react';
+import { useCreation, useMemoizedFn } from 'ahooks';
+import { keyBy, reduce, remove, omit, map, cloneDeep } from 'lodash';
+import styled from 'styled-components';
+import { Switch, Spin, Divider, Tooltip, Icon, Input } from 'luck-design/antd';
+import { formatMessage } from '@luck-design-biz/base/utils';
+import { ListEditor, ListEditorItem } from "../components/ListEditor";
+import Collapse from "../components/Collapse";
+import { SortBox, SortItem } from "../components/SortBox";
+import PanelItem from "../components/PanelItem";
+import { getFields } from "../services/complexPop";
+var _I18N_PREFIX_ = 'luckda.lowcode.painter.panel-section.complexPop';
+var DividerSpan = styled.span.withConfig({
+  displayName: "DividerSpan",
+  componentId: "luckda-6530__sc-lmsle1-0"
+})(["font-size:12px;color:var(--luck-text-color);"]);
+var FieldKey = styled.div.withConfig({
+  displayName: "FieldKey",
+  componentId: "luckda-6530__sc-lmsle1-1"
+})(["width:200px;margin-left:4px;display:inline-block;white-space:nowrap;word-break:keep-all;text-overflow:ellipsis;overflow:hidden;"]);
+var ListItem = function ListItem(_ref) {
+  var field = _ref.field,
+    fieldName = _ref.fieldName,
+    renderItemRight = _ref.renderItemRight,
+    _onChange = _ref.onChange,
+    sortable = _ref.sortable,
+    editable = _ref.editable,
+    props = _objectWithoutProperties(_ref, _excluded);
+  return /*#__PURE__*/React.createElement(ListEditorItem, _extends({
+    key: field,
+    left: /*#__PURE__*/React.createElement(Tooltip, {
+      title: field
+    }, editable ? /*#__PURE__*/React.createElement(Input, {
+      value: fieldName,
+      size: "small",
+      style: {
+        width: '200px'
+      },
+      onChange: function onChange(e) {
+        return _onChange(field, e.target.value);
+      }
+    }) : /*#__PURE__*/React.createElement(FieldKey, null, " ", fieldName, " ")),
+    right: renderItemRight({
+      field: field,
+      title: fieldName
+    }),
+    item: field,
+    sortable: sortable
+  }, props));
+};
+var ComplexPop = function ComplexPop(_ref2) {
+  var nodeId = _ref2.nodeId,
+    settings = _ref2.settings,
+    defaultValue = _ref2.defaultValue,
+    onChange = _ref2.onChange;
+  var _useState = useState(defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.show),
+    _useState2 = _slicedToArray(_useState, 2),
+    show = _useState2[0],
+    setShow = _useState2[1];
+  var _useState3 = useState((defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.fields) || []),
+    _useState4 = _slicedToArray(_useState3, 2),
+    fields = _useState4[0],
+    setFields = _useState4[1];
+  var _useState5 = useState(null),
+    _useState6 = _slicedToArray(_useState5, 2),
+    allFields = _useState6[0],
+    setAllFields = _useState6[1];
+  var _useCreation = useCreation(function () {
+      var _nodeId$split = nodeId.split('.'),
+        _nodeId$split2 = _slicedToArray(_nodeId$split, 3),
+        _ = _nodeId$split2[0],
+        blockid = _nodeId$split2[1],
+        fieldid = _nodeId$split2[2];
+      var blocksObj = keyBy(settings === null || settings === void 0 ? void 0 : settings.blocks, 'id');
+      if (blocksObj[blockid]) {
+        var _fieldObj$fieldid;
+        var fieldObj = keyBy(blocksObj[blockid].fields, 'field');
+        return ((_fieldObj$fieldid = fieldObj[fieldid]) === null || _fieldObj$fieldid === void 0 ? void 0 : _fieldObj$fieldid.complexConfig) || {};
+      }
+      return {};
+    }, [nodeId, settings === null || settings === void 0 ? void 0 : settings.blocks]),
+    isTree = _useCreation.isTree,
+    datasetKey = _useCreation.datasetKey,
+    dataModelKey = _useCreation.dataModelKey;
+  useEffect(function () {
+    if (!isTree && show && datasetKey && dataModelKey && !allFields) {
+      getFields({
+        datasetCode: datasetKey,
+        dataModelKey: dataModelKey
+      }).then(function (res) {
+        var code = res.code,
+          data = res.data;
+        if (code === 1) {
+          var _data = reduce(data, function (result, item) {
+            result[item.field] = item.field_name;
+            return result;
+          }, {});
+          setAllFields(_data);
+        }
+      });
+    }
+  }, [isTree, show, datasetKey, dataModelKey, allFields]);
+  useLayoutEffect(function () {
+    onChange({
+      show: show,
+      fields: fields
+    });
+  }, [show, fields]);
+  var renderItemDeleteRight = useMemoizedFn(function (data) {
+    return /*#__PURE__*/React.createElement(Icon, {
+      type: "delete",
+      style: {
+        margin: '0 4px',
+        cursor: 'pointer',
+        color: 'var(--luck-color-danger)'
+      },
+      onClick: function onClick() {
+        var _fields = cloneDeep(fields);
+        remove(_fields, function (item) {
+          return item.field === data.field;
+        });
+        setFields(_fields);
+      }
+    });
+  });
+  var renderItemAddRight = useMemoizedFn(function (data) {
+    return /*#__PURE__*/React.createElement(Icon, {
+      type: "plus-circle",
+      style: {
+        margin: '0 4px',
+        cursor: 'pointer',
+        color: 'var(--ant-primary-color)'
+      },
+      onClick: function onClick() {
+        return setFields(fields.concat(data));
+      }
+    });
+  });
+  var handleChange = useMemoizedFn(function (field, value) {
+    setFields(fields.map(function (item) {
+      return item.field === field ? _objectSpread(_objectSpread({}, item), {}, {
+        title: value
+      }) : item;
+    }));
+  });
+  var handleSortFields = useMemoizedFn(function (sortItems) {
+    var oldItems = cloneDeep(fields);
+    var newItems = oldItems.sort(function (a, b) {
+      var indexA = sortItems.indexOf(a.field);
+      var indexB = sortItems.indexOf(b.field);
+      return indexA - indexB;
+    });
+    setFields(newItems);
+  });
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PanelItem, {
+    field: "showPop",
+    label: formatMessage({
+      id: "".concat(_I18N_PREFIX_, ".assisted"),
+      label: "辅助选择"
+    })
+  }, /*#__PURE__*/React.createElement(Switch, {
+    size: "small",
+    defaultChecked: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.show,
+    onChange: function onChange(val) {
+      setShow(val);
+      if (!val) setFields([]);
+    }
+  })), !isTree && show && /*#__PURE__*/React.createElement(Collapse, {
+    label: formatMessage({
+      id: "".concat(_I18N_PREFIX_, ".assistedGrid"),
+      label: '辅助弹窗显示字段'
+    })
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      height: 'auto',
+      padding: '0 16px'
+    }
+  }, /*#__PURE__*/React.createElement(Spin, {
+    spinning: !allFields
+  }, /*#__PURE__*/React.createElement(Divider, {
+    orientation: "left",
+    style: {
+      marginTop: 0
+    }
+  }, /*#__PURE__*/React.createElement(DividerSpan, null, formatMessage({
+    id: "".concat(_I18N_PREFIX_, ".assistedGridFields"),
+    label: '展示区'
+  }))), /*#__PURE__*/React.createElement(SortBox, {
+    datas: fields.map(function (f) {
+      return f.field;
+    }),
+    onChange: handleSortFields
+  }, /*#__PURE__*/React.createElement(ListEditor, {
+    style: {
+      marginTop: 8
+    },
+    suppressAdd: true
+  }, fields.map(function (_ref3) {
+    var field = _ref3.field,
+      title = _ref3.title;
+    return /*#__PURE__*/React.createElement(SortItem, {
+      key: field,
+      id: field
+    }, /*#__PURE__*/React.createElement(ListItem, {
+      field: field,
+      fieldName: title,
+      renderItemRight: renderItemDeleteRight,
+      sortable: true,
+      editable: true,
+      onChange: handleChange
+    }));
+  }))), /*#__PURE__*/React.createElement(Divider, {
+    orientation: "left",
+    style: {
+      marginTop: 0
+    }
+  }, /*#__PURE__*/React.createElement(DividerSpan, null, formatMessage({
+    id: "".concat(_I18N_PREFIX_, ".gridFields"),
+    label: '可选区'
+  }))), /*#__PURE__*/React.createElement(ListEditor, {
+    style: {
+      marginTop: 8
+    },
+    suppressAdd: true
+  }, map(omit(allFields, fields.map(function (f) {
+    return f.field;
+  })), function (fieldName, field) {
+    return /*#__PURE__*/React.createElement(ListItem, {
+      key: field,
+      field: field,
+      fieldName: fieldName,
+      renderItemRight: renderItemAddRight,
+      sortable: false
+    });
+  }))))));
+};
+export default ComplexPop;

package/es/lowcode/painter/panel-section/DataSetSelector.js

@@ -95,6 +95,14 @@ var DataSetSelector = function DataSetSelector(_ref) {
                     restProps.align = alignMapping[_extra.scell_alignment];
                     restProps.headerAlign = alignMapping[_extra.sheading_alignment];
                   }
+                  if (f.property === "complex") {
+                    var _extra2 = JSON.parse(f.extra || '{}');
+                    restProps.complexConfig = {
+                      isTree: _extra2.opt_show_tree,
+                      datasetKey: _extra2.opt_dataset,
+                      dataModelKey: _extra2.opt_data_model
+                    };
+                  }
                   return _objectSpread({
                     uid: f.uid,
                     field: f.field

package/es/lowcode/painter/panel-section/FieldsSetting.js

@@ -16,7 +16,7 @@ import { fetchFieldsByDataset } from "../../constants/api-url";
 import { listReducer, getLDMetaAttr } from "../../engine/tools/helper";
 import styles from "../style/fields-setting.less";
 var _I18N_PREFIX_ = 'luckda.lowcode.painter.panel-section.fieldsSetting';
-var _PICK_KEYS_ = ['id', 'uid', 'field', 'width', 'align', 'headerAlign', 'pinned', 'tip', 'col', 'row', 'note', 'placeholder', 'fieldAliasName'];
+var _PICK_KEYS_ = ['id', 'uid', 'field', 'width', 'align', 'headerAlign', 'pinned', 'tip', 'render', 'col', 'row', 'note', 'placeholder', 'fieldAliasName', 'complexConfig'];
 var Header = styled.div.withConfig({
   displayName: "Header",
   componentId: "luckda-6530__sc-gcwvp1-0"
@@ -100,6 +100,14 @@ var FieldsSetting = function FieldsSetting(_ref) {
               restProps.align = alignMapping[extra.scell_alignment];
               restProps.headerAlign = alignMapping[extra.sheading_alignment];
             }
+            if (_fieldData.property === "complex") {
+              var _extra = JSON.parse(_fieldData.extra || '{}');
+              restProps.complexConfig = {
+                isTree: _extra.opt_show_tree,
+                datasetKey: _extra.opt_dataset,
+                dataModelKey: _extra.opt_data_model
+              };
+            }
             return _objectSpread({
               uid: id,
               field: detail[id].field
@@ -213,7 +221,25 @@ var FieldsSetting = function FieldsSetting(_ref) {
       onChange: function onChange(e) {
         return handleAliasChange(field, e.target.value);
       }
-    }), field._type !== 'divider' && /*#__PURE__*/React.createElement(Tooltip, {
+    }), field._type === 'divider' ? /*#__PURE__*/React.createElement(Tooltip, {
+      title: formatMessage({
+        id: 'luckda.lowcode.painter.delete',
+        label: '删除'
+      })
+    }, /*#__PURE__*/React.createElement(Icon, {
+      type: "delete",
+      style: {
+        margin: '0 4px',
+        cursor: 'pointer'
+      },
+      onClick: function onClick() {
+        dispatch({
+          type: 'delete',
+          payload: field.id,
+          callback: handleChange
+        });
+      }
+    })) : /*#__PURE__*/React.createElement(Tooltip, {
       title: formatMessage({
         id: 'luckda.lowcode.painter.edit',
         label: '编辑'
@@ -290,7 +316,7 @@ var FieldsSetting = function FieldsSetting(_ref) {
         tooltip: true,
         lines: 1,
         style: field._type === 'divider' ? {
-          paddingLeft: 16
+          marginLeft: 20
         } : null
       }, field.field)),
       right: renderItemRight(field),

package/es/lowcode/painter/panel-section/I18nInput.js

@@ -5,7 +5,8 @@ var I18nInput = function I18nInput(_ref) {
   var defaultValue = _ref.defaultValue,
     onChange = _ref.onChange,
     size = _ref.size,
-    wrapped = _ref.wrapped;
+    wrapped = _ref.wrapped,
+    disabled = _ref.disabled;
   var _useDebounceFn = useDebounceFn(onChange, {
       wait: 400
     }),
@@ -21,7 +22,8 @@ var I18nInput = function I18nInput(_ref) {
     autoSize: false,
     style: {
       resize: 'none'
-    }
+    },
+    disabled: disabled
   }) : /*#__PURE__*/React.createElement(Input, {
     defaultValue: defaultValue,
     onChange: function onChange(e) {

package/es/lowcode/painter/panel-section/Icon.js

@@ -1,5 +1,5 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useState } from 'react';
+import React, { useState, useLayoutEffect } from 'react';
 import styles from "../style/icon.less";
 import IconFont from "../../../components/IconFont";
 /**
@@ -28,15 +28,20 @@ import IconFont from "../../../components/IconFont";
  */
 export default function (_ref) {
   var defaultValue = _ref.defaultValue,
-    next = _ref.next;
-  var _useState = useState(defaultValue),
+    next = _ref.next,
+    _onClick = _ref.onClick,
+    value = _ref.value;
+  var _useState = useState(value || defaultValue),
     _useState2 = _slicedToArray(_useState, 2),
     val = _useState2[0],
     setVal = _useState2[1];
+  useLayoutEffect(function () {
+    setVal(value);
+  }, [value]);
   return /*#__PURE__*/React.createElement("div", {
     className: styles['lc-painter-panel-section-icon'],
     onClick: function onClick() {
-      return next({
+      return _onClick ? _onClick.apply(void 0, arguments) : next({
         onSelect: setVal
       });
     }

package/es/lowcode/painter/panel-section/IconConditionSelector.js

@@ -3,10 +3,9 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useState } from 'react';
 import { cloneDeep } from 'lodash';
 import { useMemoizedFn } from 'ahooks';
-import { Tooltip, Icon } from 'luck-design/antd';
+import { Tooltip, Icon, Popover } from 'luck-design/antd';
 import { formatMessage } from '@luck-design-biz/base/utils';
 import { ListEditor, ListEditorItem } from "../components/ListEditor";
-import PopConfirm from "../components/PopConfirm";
 import IconChoice from "./Icon";
 import IconSelector from "./IconSelector";
 import JSEditor from "./JSEditor";
@@ -24,7 +23,7 @@ var IconConditionSelector = function IconConditionSelector(_ref) {
     switch (type) {
       case 'icon':
         _list[index] = _objectSpread(_objectSpread({}, _list[index]), {}, {
-          icon: "icon".concat(value)
+          icon: value
         });
         break;
       case 'code':
@@ -93,14 +92,15 @@ var IconConditionSelector = function IconConditionSelector(_ref) {
   }, list.map(function (item, index) {
     return /*#__PURE__*/React.createElement(ListEditorItem, {
       sortable: false,
-      left: /*#__PURE__*/React.createElement(PopConfirm, {
+      left: /*#__PURE__*/React.createElement(Popover, {
         placement: "left",
-        title: /*#__PURE__*/React.createElement(IconSelector, {
+        content: /*#__PURE__*/React.createElement(IconSelector, {
           value: item.icon,
           onChange: function onChange(value) {
-            return handleChange('icon', index, value['font_class']);
+            return handleChange('icon', index, value);
           }
-        })
+        }),
+        trigger: "click"
       }, /*#__PURE__*/React.createElement(IconChoice, {
         value: item.icon
       })),

package/es/lowcode/painter/panel-section/IconSelector.js

@@ -104,7 +104,7 @@ export default function (_ref) {
   }, [iconData, searchTerm]);
   var handleClick = useMemoizedFn(function (icon) {
     var _iconfont = "".concat(iconData.css_prefix_text).concat(icon.font_class);
-    onSelect(_iconfont);
+    onSelect === null || onSelect === void 0 || onSelect(_iconfont);
     onChange(_iconfont);
   });
   return /*#__PURE__*/React.createElement("div", {

package/es/lowcode/painter/panel-section/ImpExp.js

@@ -1,12 +1,11 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useState } from 'react';
 import { useMemoizedFn, useSetState, useUpdateEffect } from 'ahooks';
-import { Checkbox, Row, Col, Input, Switch, Select, Spin, Tooltip, Radio } from 'luck-design/antd';
+import { Input, Switch, Select, Tooltip, Radio } from 'luck-design/antd';
 import { formatMessage } from '@luck-design-biz/base/utils';
 import { isString } from 'lodash';
 import { useRemoteSource } from "../../engine/provider/ContextProvider";
 import PanelItem from "../components/PanelItem";
-import styles from "../style/impexp.less";
 var _I18N_PREFIX_ = 'luckda.lowcode.painter.panel-section.impexp';
 var ImpExp = function ImpExp(_ref) {
   var defaultValue = _ref.defaultValue,
@@ -26,17 +25,6 @@ var ImpExp = function ImpExp(_ref) {
   useUpdateEffect(function () {
     onChange(state);
   }, [state]);
-  var handleCheckboxChange = useMemoizedFn(function (e) {
-    if (e.target.value === 'import') {
-      setState({
-        import: e.target.checked
-      });
-    } else if (e.target.value === 'export') {
-      setState({
-        export: e.target.checked
-      });
-    }
-  });
   var handleInputChange = useMemoizedFn(function (field, e) {
     var value = e.target.value.trim();
     var _val = value === '' ? true : value;
@@ -51,20 +39,6 @@ var ImpExp = function ImpExp(_ref) {
       });
     }
   });
-  var handleSwitchChangeExport = useMemoizedFn(function (field, e) {
-    var _value = field;
-    setState({
-      exportType: _value,
-      export: true
-    });
-  });
-  var handleSwitchChangeImport = useMemoizedFn(function (field, e) {
-    var _value = field;
-    setState({
-      importType: _value,
-      import: true
-    });
-  });
   var handleRadioChangeExport = useMemoizedFn(function (value, _ref2) {
     var key = _ref2.key;
     var _value = value;

package/es/lowcode/painter/panel-section/ImpExpAlone.js

@@ -1,13 +1,12 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React from 'react';
 import { useMemoizedFn, useSetState, useUpdateEffect } from 'ahooks';
-import { Checkbox, Row, Col, Input, Switch, Select, Tooltip, Spin, Radio } from 'luck-design/antd';
+import { Input, Select, Tooltip, Radio } from 'luck-design/antd';
 import { Segmented } from 'luck-design/antd';
 import { formatMessage } from '@luck-design-biz/base/utils';
 import PanelItem from "../components/PanelItem";
 import { isString } from 'lodash';
 import { useRemoteSource } from "../../engine/provider/ContextProvider";
-import styles from "../style/impexp.less";
 var _I18N_PREFIX_ = 'luckda.lowcode.painter.panel-section.impexp';
 var ImpExp = function ImpExp(_ref) {
   var defaultValue = _ref.defaultValue,

package/es/lowcode/painter/panel-section/LayoutRatio.js

@@ -116,6 +116,7 @@ var LayoutRatio = function LayoutRatio(_ref) {
       id: 'luckda.lowcode.painter.panel-section.Layoutratio.label',
       label: '列比例'
     }),
+    field: "columnRatio",
     suppressPadding: true
   }, /*#__PURE__*/React.createElement(RuleInput, {
     placeholder: formatMessage({