@luck-design-biz/luckda 1.0.1 → 1.0.2-2

package/es/components/LdGridForm/index.js

@@ -70,33 +70,49 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     var keys = isEmpty(fields) ? Object.keys(columnsObj) : Object.keys(fieldsObj);
     var _defaultValues = {};
     var _nodes = reduce(keys, function (result, key) {
+      var _customColumn;
       var setting = fieldsObj[key];
       var col = columnsObj[key];
-      if (col !== null && col !== void 0 && col.isShowInForm) {
-        var _customColumn;
-        var customColumn = columnsRewrite.find(function (column) {
-          return column.field === col.aliaName;
-        }) || {};
-        if (col.isReadOnly) customColumn = _objectSpread(_objectSpread({}, customColumn), {}, {
-          editable: false,
-          mode: 'grid'
-        });
-        _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, _defineProperty(_defineProperty({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
-        var newCol = _objectSpread(_objectSpread({}, col), {}, {
-          setVerifyRules: setVerifyRules,
-          fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || col.fieldName
-        });
-        var defaultSet = ['width', 'align', 'headerAlign', 'pinned', 'tip'];
-        result.push(getFormColumn(type, newCol, _objectSpread(_objectSpread(_objectSpread({}, pick(setting, defaultSet)), customColumn), {}, {
-          formItemRewrite: _objectSpread(_objectSpread({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
-            moduleCode: moduleCode,
-            formRef: formRef,
-            formMode: formMode,
-            render: setting === null || setting === void 0 ? void 0 : setting.render,
-            setting: omit(setting, [].concat(defaultSet, ['uid', 'field', 'render']))
-          })
-        })));
+      if (!(col !== null && col !== void 0 && col.isShowInForm) && !(col !== null && col !== void 0 && col.isShowInGrid)) {
+        return result;
+      }
+      var customColumn = columnsRewrite.find(function (column) {
+        return column.field === col.aliaName;
+      }) || {};
+      if (col !== null && col !== void 0 && col.isShowInForm && !(col !== null && col !== void 0 && col.isShowInGrid)) {
+        customColumn.mode = 'form';
+      } else if (!(col !== null && col !== void 0 && col.isShowInForm) && col !== null && col !== void 0 && col.isShowInGrid) {
+        customColumn.mode = 'grid';
+        customColumn.editable = false;
+        customColumn.formItemProps = function () {
+          return {
+            readOnly: true
+          };
+        };
       }
+      if (col.isReadOnly) customColumn = _objectSpread(_objectSpread({}, customColumn), {}, {
+        editable: false,
+        formItemProps: function formItemProps() {
+          return {
+            readOnly: true
+          };
+        }
+      });
+      _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, _defineProperty(_defineProperty({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
+      var newCol = _objectSpread(_objectSpread({}, col), {}, {
+        setVerifyRules: setVerifyRules,
+        fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || col.fieldName
+      });
+      var defaultSet = ['width', 'align', 'headerAlign', 'pinned', 'tip', 'formMode'];
+      result.push(getFormColumn(type, newCol, _objectSpread(_objectSpread(_objectSpread({}, pick(setting, defaultSet)), customColumn), {}, {
+        formItemRewrite: _objectSpread(_objectSpread({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
+          moduleCode: moduleCode,
+          formRef: formRef,
+          formMode: formMode,
+          render: setting === null || setting === void 0 ? void 0 : setting.render,
+          setting: omit(setting, [].concat(defaultSet, ['uid', 'field', 'render']))
+        })
+      })));
       return result;
     }, []);
     defaultValues.current = _defaultValues;

package/es/components/LdGridForm/index.less

@@ -1,7 +1,7 @@
-.ldGridForm {
-  :global {
-    .ag-layout-auto-height {
-      height: 100% !important;
-    }
-  }
-}
+.ldGridForm {
+  :global {
+    .ag-layout-auto-height {
+      height: 100% !important;
+    }
+  }
+}

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,41 +1,43 @@
-.tree {
-  .nodeTitle {
-    display: flex;
-    align-items: center;
-    width: 100%;
-    user-select: none;
-
-    div {
-      flex: 1;
-      overflow-x: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-    }
-
-    div.nodeTitleDisabled {
-      color: var(--luck-text-color-disabled);
-    }
-
-    div.nodeTitleDisabled:hover {
-      cursor: not-allowed;
-    }
-  }
-
-  :global {
-    .ant-tree-title {
-      width: 100%;
-    }
-  }
-}
-
-.classTreeOperates {
-  :global(.ant-popover-inner-content) {
-    padding: 0;
-  }
-
-  .rightMenu {
-    display: block;
-    padding: 4px 8px;
-    color: var(--luck-text-color-);
-  }
+@import '~@luck-helper/ui-design/es/style/themes/default.less';
+
+.tree {
+  .nodeTitle {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    user-select: none;
+
+    div {
+      flex: 1;
+      overflow-x: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+
+    div.nodeTitleDisabled {
+      color: @text-color-secondary_luck;
+    }
+
+    div.nodeTitleDisabled:hover {
+      cursor: not-allowed;
+    }
+  }
+
+  :global {
+    .ant-tree-title {
+      width: 100%;
+    }
+  }
+}
+
+.classTreeOperates {
+  :global(.ant-popover-inner-content) {
+    padding: 0;
+  }
+
+  .rightMenu {
+    display: block;
+    padding: 4px 8px;
+    color: @text-color;
+  }
 }

package/es/helper/action.js

@@ -7,12 +7,12 @@ import { transform, isArray, startsWith, keyBy } from 'lodash';
 import { dataFormat, behaviorCall } from "../utils";
 import { defaultComName } from "./form";
 
-/**
- * 提交行为
- * @param action 行为
- * @param data 数据
- * @param parmas 附件设置
- * @param moduleData 当前模块信息
+/**
+ * 提交行为
+ * @param action 行为
+ * @param data 数据
+ * @param parmas 附件设置
+ * @param moduleData 当前模块信息
  */
 export var doAction = function doAction(action) {
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};

package/es/helper/form.js

@@ -30,11 +30,11 @@ export var defaultComName = {
   complex: 'complex'
 };
 
-/**
- * 动态表单配置项转译
- * @param {key string} keyStr
- * @param {label string} labelStr
- * @returns [{key,label}]
+/**
+ * 动态表单配置项转译
+ * @param {key string} keyStr
+ * @param {label string} labelStr
+ * @returns [{key,label}]
  */
 export var splitStrToObj = function splitStrToObj(keyStr, labelStr) {
   var keys = keyStr && keyStr.length > 0 ? keyStr.split(',') : undefined;
@@ -51,11 +51,11 @@ export var splitStrToObj = function splitStrToObj(keyStr, labelStr) {
   return undefined;
 };
 
-/**
- * 动态表单配置项转译
- * @param {动态表单配置项} props
- * @param {自定义动态表单配置项} customProps
- * @returns {name: '',...}
+/**
+ * 动态表单配置项转译
+ * @param {动态表单配置项} props
+ * @param {自定义动态表单配置项} customProps
+ * @returns {name: '',...}
  */
 export function translator() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
@@ -122,10 +122,10 @@ export function translator() {
   return _props;
 }
 
-/**
- * 删除自动移操作中的不可覆盖字段
- * @param props
- * @returns {{multiple}|*}
+/**
+ * 删除自动移操作中的不可覆盖字段
+ * @param props
+ * @returns {{multiple}|*}
  */
 export function formatCustomProps(comType, props) {
   var _props2, _props3;

package/es/helper/index.less

@@ -1,7 +1,7 @@
-.ldLabs{
-  :global{
-    .ant-tabs-bar{
-      margin: 0 0 4px 0;
-    }
-  }
-}
+.ldLabs{
+  :global{
+    .ant-tabs-bar{
+      margin: 0 0 4px 0;
+    }
+  }
+}

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,10 +1,13 @@
 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": "低于最小值",
   "lc.form.validator.numberExceedMax": "超过最大值",
+  "luckda.lowcode.painter.I18n.empty": "敬请期待",
   "luckda.lowcode.painter.panel.attrs": "属性",
   "luckda.lowcode.painter.panel.css": "样式",
   "luckda.lowcode.painter.panel.advance": "高级",
@@ -19,8 +22,10 @@ export default {
   "luckda.lowcode.design.toolbar.clear.tip": "清除提示",
   "luckda.lowcode.design.toolbar.clear": "清除缓存",
   "luckda.lowcode.error.pagedata": "页面数据错误",
+  "luckda.lowcode.not.mobile": "此功能暂未开放",
   "luckda.lowcode.design.toolbar.pageAttrs": "页面属性",
-  "luckda.lowcode.design.toolbar.preview": "预览",
+  "luckda.lowcode.design.toolbar.debug": "调试",
+  "luckda.lowcode.design.toolbar.code": "Schema面板",
   "luckda.lowcode.design.toolbar.save": "保存",
   "luckda.lowcode.design.toolbar.pagePreview": "页面预览",
   "luckda.lowcode.design.toolbar.selectUser": "请选择模拟登录人",
@@ -79,6 +84,8 @@ export default {
   "luckda.lowcode.painter.panel-section.fieldsSetting.field": "数据字段",
   "luckda.lowcode.painter.panel-section.fieldsSetting.title": "标题",
   "luckda.lowcode.painter.panel-section.fieldsSetting.batch": "批量设置",
+  "luckda.lowcode.painter.dateSetSelector.setting": "配置字段",
+  "luckda.lowcode.painter.dateSetSelector.sync": "同步数据",
   "luckda.lowcode.painter.panel-section.complexPop.assisted": "辅助选择",
   "luckda.lowcode.painter.panel-section.complexPop.assistedGrid": "辅助弹窗显示字段",
   "luckda.lowcode.painter.panel-section.complexPop.assistedGridFields": "展示区",
@@ -182,6 +189,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": "风险等级",
@@ -213,7 +221,6 @@ export default {
   "luckda.lowcode.painter.advancePanel.events": "事件",
   "luckda.lowcode.painter.advancePanel.addEventAction": "添加事件动作",
   "luckda.lowcode.painter.actionBindModal.pageActions": "页面行为",
-  "luckda.lowcode.painter.actionBindModal.trigger": "触发器",
   "luckda.lowcode.painter.actionBindModal.custom": "自定义动作",
   "luckda.lowcode.painter.actionBindModal.coding": "动作编写",
   "luckda.lowcode.painter.actionBindModal.bind": "绑定动作",
@@ -227,12 +234,15 @@ export default {
   "luckda.lowcode.painter.panel-section.fieldsSetting.fixed.none": "不固定",
   "luckda.lowcode.painter.panel-section.fieldsSetting.fixed.left": "左",
   "luckda.lowcode.painter.panel-section.fieldsSetting.fixed.right": "右",
+  "luckda.lowcode.painter.panel-section.fieldsSetting.formMode.single": "单行",
+  "luckda.lowcode.painter.panel-section.fieldsSetting.formMode.bulk": "批量",
   "luckda.lowcode.painter.delete.tip": "确定删除吗？",
   "luckda.lowcode.painter.panel-section.fieldsSetting.width": "列宽",
   "luckda.lowcode.painter.panel-section.fieldsSetting.align": "内容对齐",
   "luckda.lowcode.painter.panel-section.fieldsSetting.headerAlign": "表头对齐",
   "luckda.lowcode.painter.panel-section.fieldsSetting.pinned": "固定列",
   "luckda.lowcode.painter.panel-section.fieldsSetting.tip": "过长提示",
+  "luckda.lowcode.painter.panel-section.fieldsSetting.formMode": "修改方式",
   "luckda.lowcode.painter.panel-section.fieldsSetting.fieldColumn": "占列数",
   "luckda.lowcode.painter.panel-section.fieldsSetting.isEqual": "唯一校验",
   "luckda.lowcode.painter.panel-section.fieldsSetting.required": "是否必填",
@@ -265,6 +275,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": "校验逻辑"
 };