@luck-design-biz/luckda 1.0.2-13 → 1.0.2-14

package/es/lowcode/view/lc-components/Wrapper.js

@@ -4,7 +4,8 @@ import React, { useEffect } from 'react';
 import { useLatest, useCreation } from 'ahooks';
 import { omit } from 'lodash';
 import { useContext, useGet, modifyNode, getLevelNodes as _getLevelNodes, getSelfAndParent } from "../../engine/provider/ContextProvider";
-import { LC_COMPONENT_UNIT_KEY, LC_COMPONENT_UNIT, RUNTIME } from "../../constants";
+import { usePageProxyContext } from "../../engine/provider/PageProxyProvider";
+import { LC_COMPONENT_UNIT_KEY, LC_COMPONENT_UNIT, RUNTIME, LC_PAGEPROXY_KEY } from "../../constants";
 import DragDropWrapper from "../../painter/components/DragDrop/DragDropWrapper";
 var LCWrapper = function LCWrapper(_ref) {
   var id = _ref.id,
@@ -13,6 +14,7 @@ var LCWrapper = function LCWrapper(_ref) {
     getTargetDom = _ref.getTargetDom,
     api = _ref.api;
   var ctx = useContext();
+  var ppCtx = usePageProxyContext();
   var selfData = useGet({
     id: id
   });
@@ -35,6 +37,7 @@ var LCWrapper = function LCWrapper(_ref) {
     ctx._register(id, new Proxy({
       id: id,
       meta: omit(meta, ['props', 'css', 'advance']),
+      $pp: ppCtx,
       set: function set(prop, value, toDom) {
         if (toDom === true) {
           if (['id', LC_COMPONENT_UNIT_KEY].includes(prop)) {
@@ -65,6 +68,9 @@ var LCWrapper = function LCWrapper(_ref) {
     if (dom) {
       dom.setAttribute('id', id);
       dom.setAttribute(LC_COMPONENT_UNIT_KEY, LC_COMPONENT_UNIT);
+      if (ppCtx) {
+        dom.setAttribute(LC_PAGEPROXY_KEY, ppCtx.id);
+      }
     }
     ctx.$publisher(ctx.topics.COMPONENT_MOUNT, {
       id: id

package/es/lowcode/view/style/canvas.less

@@ -1,5 +1,5 @@
-.lc-view-canvas {
-  position: relative;
-  width: 100%;
-  height: 100%;
-}
+.lc-view-canvas {
+  position: relative;
+  width: 100%;
+  height: 100%;
+}

package/es/lowcode/view/style/loading.less

@@ -1,98 +1,98 @@
-.masker {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  z-index: 1000;
-  background-color: transparent;
-  backdrop-filter: blur(6px);
-  cursor: none;
-}
-*:has(> .masker) {
-  position: relative;
-}
-.lc-painter-loading {
-  position: absolute;
-  height: 64px;
-  width: 64px;
-  left: calc(50% - 32px);
-  top: calc(50% - 32px);
-  -webkit-transform: translateX(-50%) translateY(-50%);
-  transform: translateX(-50%) translateY(-50%);
-  -webkit-perspective: 400px;
-  perspective: 400px;
-}
-.cube {
-  height: 64px;
-  width: 64px;
-  -webkit-transform-origin: 50% 50%;
-  transform-origin: 50% 50%;
-  -webkit-transform-style: preserve-3d;
-  transform-style: preserve-3d;
-  -webkit-animation: rotate 4s infinite ease-in-out;
-  animation: rotate 4s infinite ease-in-out;
-}
-.side {
-  position: absolute;
-  display: block;
-  height: 64px;
-  width: 64px;
-  border-radius: 4px;
-}
-.side1 {
-  background: #41c3ac;
-  -webkit-transform: translateZ(46px);
-  transform: translateZ(46px);
-}
-.side2 {
-  background: #ff884d;
-  -webkit-transform: rotateY(90deg) translateZ(46px);
-  transform: rotateY(90deg) translateZ(46px);
-}
-.side3 {
-  background: #32526e;
-  -webkit-transform: rotateY(180deg) translateZ(46px);
-  transform: rotateY(180deg) translateZ(46px);
-}
-.side4 {
-  background: #65a2c5;
-  -webkit-transform: rotateY(-90deg) translateZ(46px);
-  transform: rotateY(-90deg) translateZ(46px);
-}
-.side5 {
-  background: #ffcc5c;
-  -webkit-transform: rotateX(90deg) translateZ(46px);
-  transform: rotateX(90deg) translateZ(46px);
-}
-.side6 {
-  background: #ff6b57;
-  -webkit-transform: rotateX(-90deg) translateZ(46px);
-  transform: rotateX(-90deg) translateZ(46px);
-}
-
-@-webkit-keyframes rotate {
-  0% {
-    -webkit-transform: rotateX(0deg) rotateY(0deg) rotateZ(0deg);
-  }
-  33.33% {
-    -webkit-transform: rotateX(360deg) rotateY(0deg) rotateZ(0deg);
-  }
-  66.66% {
-    -webkit-transform: rotateX(360deg) rotateY(360deg) rotateZ(0deg);
-  }
-  100% {
-    -webkit-transform: rotateX(360deg) rotateY(360deg) rotateZ(360deg);
-  }
-}
-@keyframes rotate {
-  0% {
-    transform: rotateX(0deg) rotateY(0deg);
-  }
-  50% {
-    transform: rotateX(360deg) rotateY(0deg);
-  }
-  100% {
-    transform: rotateX(360deg) rotateY(360deg);
-  }
-}
+.masker {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1000;
+  background-color: transparent;
+  backdrop-filter: blur(6px);
+  cursor: none;
+}
+*:has(> .masker) {
+  position: relative;
+}
+.lc-painter-loading {
+  position: absolute;
+  height: 64px;
+  width: 64px;
+  left: calc(50% - 32px);
+  top: calc(50% - 32px);
+  -webkit-transform: translateX(-50%) translateY(-50%);
+  transform: translateX(-50%) translateY(-50%);
+  -webkit-perspective: 400px;
+  perspective: 400px;
+}
+.cube {
+  height: 64px;
+  width: 64px;
+  -webkit-transform-origin: 50% 50%;
+  transform-origin: 50% 50%;
+  -webkit-transform-style: preserve-3d;
+  transform-style: preserve-3d;
+  -webkit-animation: rotate 4s infinite ease-in-out;
+  animation: rotate 4s infinite ease-in-out;
+}
+.side {
+  position: absolute;
+  display: block;
+  height: 64px;
+  width: 64px;
+  border-radius: 4px;
+}
+.side1 {
+  background: #41c3ac;
+  -webkit-transform: translateZ(46px);
+  transform: translateZ(46px);
+}
+.side2 {
+  background: #ff884d;
+  -webkit-transform: rotateY(90deg) translateZ(46px);
+  transform: rotateY(90deg) translateZ(46px);
+}
+.side3 {
+  background: #32526e;
+  -webkit-transform: rotateY(180deg) translateZ(46px);
+  transform: rotateY(180deg) translateZ(46px);
+}
+.side4 {
+  background: #65a2c5;
+  -webkit-transform: rotateY(-90deg) translateZ(46px);
+  transform: rotateY(-90deg) translateZ(46px);
+}
+.side5 {
+  background: #ffcc5c;
+  -webkit-transform: rotateX(90deg) translateZ(46px);
+  transform: rotateX(90deg) translateZ(46px);
+}
+.side6 {
+  background: #ff6b57;
+  -webkit-transform: rotateX(-90deg) translateZ(46px);
+  transform: rotateX(-90deg) translateZ(46px);
+}
+
+@-webkit-keyframes rotate {
+  0% {
+    -webkit-transform: rotateX(0deg) rotateY(0deg) rotateZ(0deg);
+  }
+  33.33% {
+    -webkit-transform: rotateX(360deg) rotateY(0deg) rotateZ(0deg);
+  }
+  66.66% {
+    -webkit-transform: rotateX(360deg) rotateY(360deg) rotateZ(0deg);
+  }
+  100% {
+    -webkit-transform: rotateX(360deg) rotateY(360deg) rotateZ(360deg);
+  }
+}
+@keyframes rotate {
+  0% {
+    transform: rotateX(0deg) rotateY(0deg);
+  }
+  50% {
+    transform: rotateX(360deg) rotateY(0deg);
+  }
+  100% {
+    transform: rotateX(360deg) rotateY(360deg);
+  }
+}

package/es/lowcode/view/style/page.less

@@ -1,8 +1,8 @@
-.lc-view-page {
-  position: relative;
-  width: 100%;
-  height: 100%;
-}
-.lc-view-page.isloading {
-  overflow: hidden;
+.lc-view-page {
+  position: relative;
+  width: 100%;
+  height: 100%;
+}
+.lc-view-page.isloading {
+  overflow: hidden;
 }

package/es/upload/FilesWall/index.js

@@ -14,11 +14,11 @@ import { last, lowerCase, split, replace } from 'lodash';
 import { Box, Permission, PermissionGroup } from 'luck-design';
 import styles from "./index.less";
 
-/**
- * 附件墙
- * @param props
- * @returns {JSX.Element}
- * @constructor
+/**
+ * 附件墙
+ * @param props
+ * @returns {JSX.Element}
+ * @constructor
  */
 var FilesWall = /*#__PURE__*/forwardRef(function (props, ref) {
   var _props$rowKey = props.rowKey,
@@ -297,10 +297,10 @@ var FilesWall = /*#__PURE__*/forwardRef(function (props, ref) {
     }
   }, "\u5220\u9664"));
 
-  /**
-   * 删除
-   * @param selectedRows 选择的数据
-   * @param isCheck 是否批量勾选
+  /**
+   * 删除
+   * @param selectedRows 选择的数据
+   * @param isCheck 是否批量勾选
    */
   var handleDelete = function handleDelete(selectedRows, isCheck) {
     setState({
@@ -344,10 +344,10 @@ var FilesWall = /*#__PURE__*/forwardRef(function (props, ref) {
     });
   };
 
-  /**
-   * 下载附件
-   * @param filenames
-   * @param tag downloadOne：下载单个，其他批量
+  /**
+   * 下载附件
+   * @param filenames
+   * @param tag downloadOne：下载单个，其他批量
    */
   var downloadFile = function downloadFile(filenames, tag) {
     saveAs("".concat(getUrl('download'), "&fileName=").concat(filenames[0]));

package/es/upload/FilesWall/index.less

@@ -1,74 +1,74 @@
-.operates {
-  display: flex;
-  margin-bottom: 8px;
-}
-
-.filesWall {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  width: 100%;
-  box-sizing: border-box;
-
-  .fileContent {
-    position: relative;
-
-    .check {
-      position: absolute;
-      right: 8px;
-      top: -3px;
-    }
-
-    .img {
-      position: relative;
-      padding: 8px;
-      border: 1px solid #d9d9d9;
-      border-radius: 4px 0 4px 4px;
-      display: table;
-      float: left;
-      width: 104px;
-      height: 104px;
-      margin-right: 8px;
-      margin-bottom: 8px;
-      text-align: center;
-      vertical-align: top;
-      cursor: pointer;
-      -webkit-transition: border-color 0.3s ease;
-      transition: border-color 0.3s ease;
-    }
-  }
-
-  .actions {
-    width: 104px !important;
-    height: 104px !important;
-    position: absolute;
-    background-color: rgba(0, 0, 0, 0.4);
-    border-radius: 4px;
-    display: none !important;
-
-    .actionsChild {
-      margin-top: 35%;
-    }
-  }
-
-  .fileContent:hover + .actions,
-  .actions:hover {
-    display: block !important;
-  }
-
-  :global {
-    .ant-upload-select-picture-card i {
-      font-size: 32px;
-      color: #999;
-    }
-
-    .ant-upload-select-picture-card .ant-upload-text {
-      margin-top: 8px;
-      color: #666;
-    }
-
-    .ant-upload-picture-card-wrapper {
-      width: auto;
-    }
-  }
-}
+.operates {
+  display: flex;
+  margin-bottom: 8px;
+}
+
+.filesWall {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  width: 100%;
+  box-sizing: border-box;
+
+  .fileContent {
+    position: relative;
+
+    .check {
+      position: absolute;
+      right: 8px;
+      top: -3px;
+    }
+
+    .img {
+      position: relative;
+      padding: 8px;
+      border: 1px solid #d9d9d9;
+      border-radius: 4px 0 4px 4px;
+      display: table;
+      float: left;
+      width: 104px;
+      height: 104px;
+      margin-right: 8px;
+      margin-bottom: 8px;
+      text-align: center;
+      vertical-align: top;
+      cursor: pointer;
+      -webkit-transition: border-color 0.3s ease;
+      transition: border-color 0.3s ease;
+    }
+  }
+
+  .actions {
+    width: 104px !important;
+    height: 104px !important;
+    position: absolute;
+    background-color: rgba(0, 0, 0, 0.4);
+    border-radius: 4px;
+    display: none !important;
+
+    .actionsChild {
+      margin-top: 35%;
+    }
+  }
+
+  .fileContent:hover + .actions,
+  .actions:hover {
+    display: block !important;
+  }
+
+  :global {
+    .ant-upload-select-picture-card i {
+      font-size: 32px;
+      color: #999;
+    }
+
+    .ant-upload-select-picture-card .ant-upload-text {
+      margin-top: 8px;
+      color: #666;
+    }
+
+    .ant-upload-picture-card-wrapper {
+      width: auto;
+    }
+  }
+}

package/es/upload/Form/index.less

@@ -1,7 +1,7 @@
-.fileGrid {
-  :global {
-    .ag-root-wrapper-body.ag-layout-normal {
-      height: 100% !important;
-    }
-  }
-}
+.fileGrid {
+  :global {
+    .ag-root-wrapper-body.ag-layout-normal {
+      height: 100% !important;
+    }
+  }
+}

package/es/upload/FormItem/index.js

@@ -8,21 +8,21 @@ import { BasicFormItem } from 'luck-design';
 import { history, getCreateHistoryOptions } from 'umi';
 import { formatMessage, beforeUpload as _beforeUpload, getSupportUploadTypes, string2ASCII } from '@luck-design-biz/base/utils';
 
-/**
- * 表单类型富文本上传
- * 是否实体字段： 是
- * 是否接受tag： 是
- * 是否虚拟主键： 否
- * 接受参数： 
- *    name: 附件名称逗号拼接
- *    name_virtual: [{...// 附件所有参数}]
- *    ### name=name_virtual ###
- * 传参： 
- *    name: [{objectName, marker},...]
- * 其他需求： 
- *  支持beforeUpload禁止附加类型
- *  =>beforeUpload禁止类型全覆盖
- *  =>forbiddenTypes和配置管理中禁止类型合并
+/**
+ * 表单类型富文本上传
+ * 是否实体字段： 是
+ * 是否接受tag： 是
+ * 是否虚拟主键： 否
+ * 接受参数： 
+ *    name: 附件名称逗号拼接
+ *    name_virtual: [{...// 附件所有参数}]
+ *    ### name=name_virtual ###
+ * 传参： 
+ *    name: [{objectName, marker},...]
+ * 其他需求： 
+ *  支持beforeUpload禁止附加类型
+ *  =>beforeUpload禁止类型全覆盖
+ *  =>forbiddenTypes和配置管理中禁止类型合并
  */
 
 function buildComponent(props) {

package/es/utils/form.js

@@ -18,11 +18,11 @@ import { defaultComName, translator, splitStrToObj, formatCustomProps } from "..
 import { getColumnRender } from "./grid";
 import * as formItemUtils from "../helper/FromItems";
 
-/**
- * 根据动态表单配置项生成formItem
- * @param {动态表单配置项} props
- * @param {自定义动态表单配置项} customProps
- * @returns <BasicForm name='' ... />
+/**
+ * 根据动态表单配置项生成formItem
+ * @param {动态表单配置项} props
+ * @param {自定义动态表单配置项} customProps
+ * @returns <BasicForm name='' ... />
  */
 export function getFormItem() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
@@ -56,11 +56,11 @@ export function getFormItem() {
   }));
 }
 
-/**
- * 根据后端返回数据组装表单数据
- * @param {数组---动态表单配置参数列表} propsList
- * @param {对象---后端返回的未处理数据} values
- * @returns
+/**
+ * 根据后端返回数据组装表单数据
+ * @param {数组---动态表单配置参数列表} propsList
+ * @param {对象---后端返回的未处理数据} values
+ * @returns
  */
 export var formItemDataFormat = function formItemDataFormat() {
   var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -130,11 +130,11 @@ export var formItemDataFormat = function formItemDataFormat() {
   return _objectSpread(_objectSpread({}, omitValues), data);
 };
 
-/**
- * 数据格式化
- * @param {数组---动态表单配置参数列表} propsList
- * @param {对象---表单获取到的未处理数据} values
- * @returns
+/**
+ * 数据格式化
+ * @param {数组---动态表单配置参数列表} propsList
+ * @param {对象---表单获取到的未处理数据} values
+ * @returns
  */
 export var dataFormat = function dataFormat() {
   var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -199,12 +199,12 @@ export var dataFormat = function dataFormat() {
   return _objectSpread(_objectSpread({}, values), data);
 };
 
-/**
- *
- * @param formType
- * @param props
- * @param customProps
- * @returns {*&{field: *, editable: (false|{required: *}), renderBasicFormItem: ((function(): (*))|*), title, render: *}}
+/**
+ *
+ * @param formType
+ * @param props
+ * @param customProps
+ * @returns {*&{field: *, editable: (false|{required: *}), renderBasicFormItem: ((function(): (*))|*), title, render: *}}
  */
 export var getFormColumn = function getFormColumn() {
   var _props$config;

package/lib/components/Builder/index.js

@@ -20,8 +20,9 @@ var _LdPop = _interopRequireDefault(require("../LdPop"));
 var _services = require("../../services");
 var _action2 = require("../../helper/action");
 var LuckDaContext = exports.LuckDaContext = /*#__PURE__*/(0, _react.createContext)();
-var useLDCtx = exports.useLDCtx = function useLDCtx() {
-  return (0, _react.useContext)(LuckDaContext);
+var useLDCtx = exports.useLDCtx = function useLDCtx(pageProxy) {
+  var ctx = (0, _react.useContext)(LuckDaContext);
+  return ctx[(pageProxy === null || pageProxy === void 0 ? void 0 : pageProxy.proxyCode) || 'master'];
 };
 var builder = function builder(WrappedComponent, moduleCode) {
   var Component = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
@@ -125,14 +126,16 @@ var builder = function builder(WrappedComponent, moduleCode) {
       label: '模块缺少数据集'
     });
     return /*#__PURE__*/_react.default.createElement(LuckDaContext.Provider, {
-      value: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, moduleData), {}, {
-        doAction: doAction,
-        openPop: openPop,
-        closePop: closePop,
-        readFieldProps: readFieldProps,
-        setFieldProps: setFieldProps,
-        moduleCode: moduleCode
-      })
+      value: {
+        master: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, moduleData), {}, {
+          doAction: doAction,
+          openPop: openPop,
+          closePop: closePop,
+          readFieldProps: readFieldProps,
+          setFieldProps: setFieldProps,
+          moduleCode: moduleCode
+        })
+      }
     }, /*#__PURE__*/_react.default.createElement(WrappedComponent, (0, _extends2.default)({
       ref: ref
     }, moduleData || {}, {