@luck-design-biz/luckda 1.0.6-13tl → 1.0.7

package/lib/components/LdInfoPanel/index.js

@@ -59,14 +59,20 @@ var LdInfoPanel = function LdInfoPanel(_ref) {
     });
   });
   var _columns = (0, _ahooks.useCreation)(function () {
-    return customColumns ? customColumns.map(function (col) {
-      var xCol = columns.find(function (column) {
-        return column.aliaName === col.dataIndex;
-      }) || {};
-      return (0, _objectSpread2.default)({
-        title: xCol.fieldName
-      }, col);
-    }) : (0, _lodash.transform)(columns, function (result, item) {
+    if ((0, _lodash.isArray)(customColumns)) {
+      return customColumns.map(function (col) {
+        var xCol = columns.find(function (column) {
+          return column.aliaName === col.dataIndex;
+        }) || {};
+        return (0, _objectSpread2.default)({
+          title: xCol.fieldName
+        }, col);
+      });
+    }
+    if ((0, _lodash.isFunction)(customColumns)) {
+      return customColumns(columns);
+    }
+    return (0, _lodash.transform)(columns, function (result, item) {
       if (item.isShowInForm) {
         result.push({
           title: item.fieldName,
@@ -111,7 +117,7 @@ Index.propTypes = {
   // 抑制初始化
   afterInit: _propTypes.default.func,
   // 初始化后
-  customColumns: _propTypes.default.array,
+  customColumns: _propTypes.default.oneOfType([_propTypes.default.array, _propTypes.default.func]),
   defaultParmas: _propTypes.default.object
 };
 Index.defaultProps = {

package/lib/helper/FromItems.js

@@ -26,7 +26,7 @@ var _excluded = ["onBlur"],
   _excluded4 = ["handleValueChange", "config"],
   _excluded5 = ["onBlur"],
   _excluded6 = ["handleValueChange", "config"],
-  _excluded7 = ["onChange"],
+  _excluded7 = ["onChange", "format"],
   _excluded8 = ["handleValueChange", "config"],
   _excluded9 = ["handleValueChange", "onChange", "params", "extraFilter"],
   _excluded10 = ["onChange"],
@@ -35,7 +35,7 @@ var _excluded = ["onBlur"],
   _excluded13 = ["handleValueChange", "config", "allowClear"],
   _excluded14 = ["renderInfoMode"],
   _excluded15 = ["onChange"],
-  _excluded16 = ["handleValueChange", "config", "selectorProps", "suppressSelect"],
+  _excluded16 = ["handleValueChange", "config", "selectorProps", "suppressSelect", "auth", "leafOnly"],
   _excluded17 = ["onClose"],
   _excluded18 = ["handleValueChange", "config"],
   _excluded19 = ["onChange"],
@@ -48,6 +48,60 @@ var _excluded = ["onBlur"],
   _excluded26 = ["handleValueChange", "config"],
   _excluded27 = ["onChange"],
   _excluded28 = ["handleValueChange", "config"];
+var data_config = {
+  'YYYY-MM-DD HH:mm:ss': {
+    type: 'date',
+    showTime: {
+      format: 'HH:mm:ss'
+    }
+  },
+  'YYYY-MM-DD HH:mm': {
+    type: 'date',
+    showTime: {
+      format: 'HH:mm'
+    }
+  },
+  'YYYY-MM-DD HH': {
+    type: 'date',
+    showTime: {
+      format: 'HH'
+    }
+  },
+  'YYYY-MM-DD': {
+    type: 'date',
+    showTime: false
+  },
+  'YYYY-MM': {
+    type: 'month',
+    showTime: false
+  },
+  'YYYY-wo': {
+    type: 'week',
+    showTime: false
+  },
+  'YYYY': {
+    type: 'year',
+    showTime: false
+  },
+  'HH:mm:ss': {
+    type: 'time',
+    showTime: {
+      format: 'HH:mm:ss'
+    }
+  },
+  'HH:mm': {
+    type: 'time',
+    showTime: {
+      format: 'HH:mm'
+    }
+  },
+  'mm:ss': {
+    type: 'time',
+    showTime: {
+      format: 'mm:ss'
+    }
+  }
+};
 var getNumberItem = exports.getNumberItem = function getNumberItem() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     handleValueChange = _ref.handleValueChange,
@@ -112,13 +166,14 @@ var getDateItem = exports.getDateItem = function getDateItem() {
     _ref7$config = _ref7.config,
     _ref7$config2 = _ref7$config === void 0 ? {} : _ref7$config,
     _onChange = _ref7$config2.onChange,
+    format = _ref7$config2.format,
     _config = (0, _objectWithoutProperties2.default)(_ref7$config2, _excluded7),
     props = (0, _objectWithoutProperties2.default)(_ref7, _excluded8);
   return /*#__PURE__*/_react.default.createElement(_luckDesign.BasicFormItem, (0, _extends2.default)({}, props, {
     $attrs: (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _constants.LC_COMPONENT_UNIT_KEY, _constants.LC_FORMITEM_UNIT), 'data-__component', 'FieldDate'),
     type: "datePicker",
-    config: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _config), {}, {
-      type: 'date',
+    config: (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, data_config[format]), _config), {}, {
+      format: format,
       onChange: function onChange(date, dateString) {
         handleValueChange && handleValueChange(date);
         _onChange && _onChange(date, dateString);
@@ -243,10 +298,14 @@ var getGroupItem = exports.getGroupItem = function getGroupItem(_ref19) {
     _ref19$selectorProps = _ref19.selectorProps,
     selectorProps = _ref19$selectorProps === void 0 ? {} : _ref19$selectorProps,
     suppressSelect = _ref19.suppressSelect,
+    _ref19$auth = _ref19.auth,
+    auth = _ref19$auth === void 0 ? false : _ref19$auth,
+    _ref19$leafOnly = _ref19.leafOnly,
+    leafOnly = _ref19$leafOnly === void 0 ? false : _ref19$leafOnly,
     props = (0, _objectWithoutProperties2.default)(_ref19, _excluded16);
   return /*#__PURE__*/_react.default.createElement(_base.TreeSelector, (0, _extends2.default)({}, props, {
     $attrs: (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _constants.LC_COMPONENT_UNIT_KEY, _constants.LC_FORMITEM_UNIT), 'data-__component', 'FieldGroup'),
-    api: "/api/base/group/sysGroupTree/noAuthReadJurisTree?sclassKey=".concat(props.sclassKey),
+    api: "/api/base/group/sysGroupTree/".concat(auth ? 'noAuthReadJurisTree' : 'noAuthReadNoJurisTree', "?sclassKey=").concat(props.sclassKey, "&ex=").concat(escape(leafOnly ? 'ichildren!=0' : '')),
     selectorProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, selectorProps), {}, {
       suppressSelect: suppressSelect
     }),

package/lib/helper/form.js

@@ -74,12 +74,18 @@ function translator() {
   var allConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), JSON.parse(extra || '{}'));
   var _props = {
     name: allConfig.aliaName,
-    label: allConfig.fieldName,
+    label: allConfig.fieldAliasName || allConfig.fieldName,
     config: {
       required: !!allConfig.isNotNull,
-      disabled: !!allConfig.isReadOnly
+      disabled: !!allConfig.isReadOnly,
+      placeholder: allConfig.placeholder,
+      rows: allConfig.rows
     },
     layout: 'block',
+    align: allConfig.align,
+    headerAlign: allConfig.headerAlign,
+    width: allConfig.width,
+    tip: allConfig.tip,
     col: allConfig.col || 1,
     row: allConfig.row || 1
   };

package/lib/helper/ldBuilder.js

@@ -1,13 +1,12 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ErrorWrapper = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _Builder = require("../components/Builder");
 var _utils = require("@luck-design-biz/base/utils");
@@ -21,12 +20,15 @@ var builder = function builder(wrapped) {
       dataSetKey = props.dataSetKey,
       wrapper = props.wrapper,
       className = props.className,
-      style = props.style;
-    var _ref = (0, _react.useContext)(_Builder.LuckDaContext) || {},
+      style = props.style,
+      pageProxy = props.pageProxy;
+    var _ref = (0, _Builder.useLDCtx)(pageProxy) || {},
       resources = _ref.resources,
       actions = _ref.actions,
       _ref$dataSets = _ref.dataSets,
       dataSets = _ref$dataSets === void 0 ? [] : _ref$dataSets,
+      _ref$moduleUiList = _ref.moduleUiList,
+      moduleUiList = _ref$moduleUiList === void 0 ? {} : _ref$moduleUiList,
       _ref$isTree = _ref.isTree,
       isTree = _ref$isTree === void 0 ? [] : _ref$isTree,
       doAction = _ref.doAction,
@@ -67,7 +69,8 @@ var builder = function builder(wrapped) {
       resources: resources,
       actions: actions,
       doAction: doAction,
-      moduleCode: moduleCode
+      moduleCode: moduleCode,
+      uiSettings: moduleUiList[dataSetKey] // form和grid的页面配置信息
     });
     return wrapped(wrappedProps);
   };

package/lib/helper/ldComBuild.js

@@ -16,10 +16,10 @@ var _utils = require("@luck-design-biz/base/utils");
 var _Builder = require("../components/Builder");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _index = _interopRequireDefault(require("./index.less"));
-var _excluded = ["$css"],
-  _excluded2 = ["className", "$css"];
-var getResources = exports.getResources = function getResources() {
-  var _ref = (0, _react.useContext)(_Builder.LuckDaContext) || {},
+var _excluded = ["$css", "pageProxy"],
+  _excluded2 = ["className", "$css", "pageProxy"];
+var getResources = exports.getResources = function getResources(pageProxy) {
+  var _ref = (0, _Builder.useLDCtx)(pageProxy) || {},
     _ref$resources = _ref.resources,
     resources = _ref$resources === void 0 ? [] : _ref$resources;
   return resources;
@@ -27,26 +27,29 @@ var getResources = exports.getResources = function getResources() {
 var ldComBuilder = exports.ldComBuilder = function ldComBuilder(Com) {
   var Component = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     var $css = _ref2.$css,
+      pageProxy = _ref2.pageProxy,
       props = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
-    var resources = getResources();
+    var resources = getResources(pageProxy);
     var hasResources = (0, _ahooks.useCreation)(function () {
       return (0, _lodash.isNil)(props === null || props === void 0 ? void 0 : props.resource) || (0, _lodash.includes)(resources, props.resource);
     }, [props === null || props === void 0 ? void 0 : props.resource, resources]);
     if (hasResources) {
       return /*#__PURE__*/_react.default.createElement(Com, (0, _extends2.default)({}, props, {
+        pageProxy: pageProxy,
         ref: ref
       }));
     }
     return props.serialEffect === 'hidden' ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null) : /*#__PURE__*/_react.default.createElement(Com, (0, _extends2.default)({}, props, {
       disabled: true,
+      pageProxy: pageProxy,
       ref: ref
     }));
   });
   return Component;
 };
-var filterOptions = exports.filterOptions = function filterOptions(options) {
-  var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'resource';
-  var resources = getResources();
+var filterOptions = exports.filterOptions = function filterOptions(options, pageProxy) {
+  var key = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'resource';
+  var resources = getResources(pageProxy);
   return (0, _lodash.intersectionWith)(options, resources, function (arrVal, othVal) {
     return !arrVal[key] || arrVal[key] === othVal;
   });
@@ -55,9 +58,11 @@ var deepFilterCom = exports.deepFilterCom = function deepFilterCom(Com, childMar
   var Component = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
     var className = _ref3.className,
       $css = _ref3.$css,
+      pageProxy = _ref3.pageProxy,
       props = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
-    var resources = getResources();
+    var resources = getResources(pageProxy);
     var com = /*#__PURE__*/_react.default.createElement(Com, (0, _extends2.default)({}, props, {
+      pageProxy: pageProxy,
       className: (0, _classnames.default)(_index.default.ldLabs, (0, _defineProperty2.default)({}, className, !!className)),
       ref: ref
     }));

package/lib/locales/zh-CN.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _default = exports.default = {
   "luckda.lowcode.view.lc-components.label.all": "全部",
+  "luckda.lowcode.view.lc-component.design.show": "请在预览、运行界面查看嵌入的代理页面",
   "luckda.lowcode.painter.import": "导入",
   "luckda.lowcode.painter.components.fullscreen-exit.tip": "退出全屏",
   "luckda.lowcode.painter.components.fullscreen.tip": "全屏",
@@ -13,6 +14,9 @@ var _default = exports.default = {
   "lc.form.validator.textNum": "个字符",
   "lc.form.validator.numberBelowMin": "低于最小值",
   "lc.form.validator.numberExceedMax": "超过最大值",
+  "luckda.lowcode.design.toolbar.selectUser": "模拟登录人",
+  "luckda.lowcode.design.toolbar.placeholder.selectUser": "请选择模拟登录人",
+  "luckda.lowcode.design.toolbar.debugTool": "调试工具",
   "luckda.lowcode.painter.I18n.empty": "敬请期待",
   "luckda.lowcode.painter.panel.attrs": "属性",
   "luckda.lowcode.painter.panel.css": "样式",
@@ -40,11 +44,10 @@ var _default = exports.default = {
   "luckda.lowcode.design.toolbar.clear": "清除缓存",
   "luckda.lowcode.not.mobile": "此功能暂未开放",
   "luckda.lowcode.design.toolbar.pageAttrs": "页面属性",
-  "luckda.lowcode.design.toolbar.debug": "调试",
+  "luckda.lowcode.design.toolbar.shortcut": "快捷键",
   "luckda.lowcode.design.toolbar.code": "Schema面板",
+  "luckda.lowcode.design.toolbar.debug": "调试",
   "luckda.lowcode.design.toolbar.save": "保存",
-  "luckda.lowcode.design.toolbar.pagePreview": "页面预览",
-  "luckda.lowcode.design.toolbar.selectUser": "请选择模拟登录人",
   "app.base.operate.comfire.leave": "离开当前页面？",
   "app.base.operate.comfire.message.leave": "系统可能不会保存您所做的更改。",
   "luckda.lowcode.painter.components.search": "搜索组件",
@@ -82,6 +85,22 @@ var _default = exports.default = {
   "luckda.lowcode.painter.panel-section.splitdisplay.split": "分割方向",
   "luckda.lowcode.painter.panel-section.splitdisplay.ratio": "列比例",
   "luckda.lowcode.painter.panel-section.Layoutratio.placeholder": "请输入列比例",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.param-origin.state": "页面全局状态",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.param-origin.global": "页面全局变量",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.param-origin.url": "页面URL参数",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.param-origin.string": "字符串常量",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.param-origin.num": "数字常量",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.param-origin.bool": "布尔常量",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.param-name": "参数名称",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.warn.param-name": "请输入参数名称",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.param-origin": "参数来源",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.param-value": "值或变量名",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.warn.param-value": "请输入参数值或变量名",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.add": "添加参数",
+  "luckda.lowcode.painter.panel-section.proxy-params-setter.save": "保存并返回",
+  "luckda.lowcode.painter.panel-section.proxy-linker.add": "新建页面",
+  "luckda.lowcode.painter.panel-section.proxy-linker.edit": "编辑页面",
+  "luckda.lowcode.painter.panel-section.proxy-linker.sync": "同步数据",
   "luckda.lowcode.painter.pageVars.var": "变量",
   "luckda.lowcode.painter.pageVars.api": "远程 API",
   "luckda.lowcode.painter.pageVars.edit": "编辑数据源",
@@ -198,6 +217,7 @@ var _default = exports.default = {
   "luckda.lowcode.painter.panel-section.blocksEditor.writer": "行内编辑表格",
   "luckda.lowcode.painter.panel-section.blocksEditor.uploadForm": "附件列表",
   "luckda.lowcode.painter.panel-section.blocksEditor.blank": "空白区",
+  "luckda.lowcode.painter.panel-section.blocksEditor.defaultBlock": "默认区块",
   "luckda.lowcode.painter.panel-section.blocksEditor.addBlock": "新增区块",
   "luckda.lowcode.painter.panel-section.actionsEditor.button": "按钮",
   "luckda.lowcode.painter.panel-section.actionsEditor.text": "文本",
@@ -253,6 +273,20 @@ var _default = exports.default = {
   "luckda.lowcode.painter.actionBindModal.params": "配置参数",
   "luckda.lowcode.painter.actionBindModal.params.info": "请勿随意修改配置参数结构和参数名称，参数异常可能会导致请求失败",
   "luckda.lowcode.painter.actionBindModal.noActionSelected": "请在右侧选择行为项",
+  "luckda.lowcode.design.toolbar.shortcut.save": "保存",
+  "luckda.lowcode.design.toolbar.shortcut.preview": "预览调试",
+  "luckda.lowcode.design.toolbar.shortcut.undo": "撤销",
+  "luckda.lowcode.design.toolbar.shortcut.redo": "重做",
+  "luckda.lowcode.design.toolbar.shortcut.copy": "克隆组件",
+  "luckda.lowcode.design.toolbar.shortcut.delete": "删除组件",
+  "luckda.lowcode.design.toolbar.shortcut.selectParent": "选择父级组件",
+  "luckda.lowcode.design.toolbar.shortcut.selectChildren": "选择子级组件",
+  "luckda.lowcode.design.toolbar.shortcut.selectLeftBrother": "向左选择兄弟组件",
+  "luckda.lowcode.design.toolbar.shortcut.selectRightBrother": "向右选择兄弟组件",
+  "luckda.lowcode.design.toolbar.shortcut.moveLeft": "向左移动组件",
+  "luckda.lowcode.design.toolbar.shortcut.moveRight": "向右移动组件",
+  "luckda.lowcode.design.toolbar.shortcut.general": "常规操作",
+  "luckda.lowcode.design.toolbar.shortcut.others": "组件选择和移动",
   "luckda.lowcode.painter.panel-section.fieldsSetting.align.left": "居左",
   "luckda.lowcode.painter.panel-section.fieldsSetting.align.center": "居中",
   "luckda.lowcode.painter.panel-section.fieldsSetting.align.right": "居右",
@@ -275,6 +309,7 @@ var _default = exports.default = {
   "luckda.lowcode.painter.panel-section.fieldsSetting.form.display": "表单中显示",
   "luckda.lowcode.painter.panel-section.fieldsSetting.writable": "是否可写",
   "luckda.lowcode.painter.panel-section.fieldsSetting.readonly": "是否只读",
+  "luckda.lowcode.painter.panel-section.fieldsSetting.dateFormat": "日期格式",
   "luckda.lowcode.painter.panel-section.fieldsSetting.render": "内容定制渲染",
   "luckda.lowcode.painter.panel-section.fieldsSetting.defaultValue": "默认值",
   "luckda.lowcode.painter.settingTo": "设置为",
@@ -300,5 +335,6 @@ var _default = exports.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.panel-section.fieldsSetting.checkRules.logic": "校验逻辑",
+  "luckda.lowcode.view.lc-component.design.nocode": "缺少页面代理编码配置"
 };