@luck-design-biz/luckda 1.0.2 → 1.0.4-13tl

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

@@ -61,6 +61,8 @@ var LCWrapper = function LCWrapper(_ref) {
       get: function get(target, property, receiver) {
         if (property === 'api') {
           return api ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _api), api.current) : _api;
+        } else if (property === 'name') {
+          return _selfData.current.props.name;
         }
         return Reflect.get(target, property, receiver);
       }

package/lib/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/lib/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/lib/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/lib/upload/FilesWall/index.js

@@ -21,11 +21,11 @@ var _lodash = require("lodash");
 var _luckDesign = require("luck-design");
 var _index = _interopRequireDefault(require("./index.less"));
 var _excluded = ["rowKey", "formMode", "beforeUpload", "onUploadChange", "moduleCode", "docUid", "bucket", "operates", "zipName", "showNote", "tag", "maxLength"];
-/**
- * 附件墙
- * @param props
- * @returns {JSX.Element}
- * @constructor
+/**
+ * 附件墙
+ * @param props
+ * @returns {JSX.Element}
+ * @constructor
  */
 var FilesWall = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _props$rowKey = props.rowKey,
@@ -157,12 +157,22 @@ var FilesWall = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     });
     onUploadChange && onUploadChange(e);
   };
+  var headers = {};
+  var token = window.cookie.get(window.appConfig.authSaveKey);
+  if (token) headers.Authorization = "Bearer ".concat(token);
+  var ticket = _umi.history.location.query.ticket;
+  if (ticket) headers.ticket = (0, _utils.string2ASCII)(ticket);
+  if (window.__POWERED_BY_QIANKUN__) {
+    var pathname = (0, _lodash.replace)(window.location.pathname, (0, _umi.getCreateHistoryOptions)().basename, '');
+    headers['Mf-Path'] = pathname.length > 0 ? pathname : '/';
+    headers['Sys-Code'] = (0, _umi.getCreateHistoryOptions)().basename.split('/')[1];
+    if (window.routeCode) headers['Menu-Code'] = window.routeCode;
+  }
+  ;
   var formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
     action: getUrl('upload'),
     // 上传地址
-    headers: {
-      Authorization: "Bearer ".concat(window.cookie.get(window.appConfig.authSaveKey))
-    },
+    headers: headers,
     // 请求头
     name: 'files',
     multiple: true,
@@ -294,10 +304,10 @@ var FilesWall = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }
   }, "\u5220\u9664"));
 
-  /**
-   * 删除
-   * @param selectedRows 选择的数据
-   * @param isCheck 是否批量勾选
+  /**
+   * 删除
+   * @param selectedRows 选择的数据
+   * @param isCheck 是否批量勾选
    */
   var handleDelete = function handleDelete(selectedRows, isCheck) {
     setState({
@@ -341,10 +351,10 @@ var FilesWall = /*#__PURE__*/(0, _react.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/lib/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/lib/upload/Form/gridForm.js

@@ -206,12 +206,22 @@ var UploadGridForm = function UploadGridForm(_ref) {
     }
   });
   var renderUploadTopLeft = (0, _ahooks.useMemoizedFn)(function () {
+    var headers = {};
+    var token = window.cookie.get(window.appConfig.authSaveKey);
+    if (token) headers.Authorization = "Bearer ".concat(token);
+    var ticket = _umi.history.location.query.ticket;
+    if (ticket) headers.ticket = (0, _utils.string2ASCII)(ticket);
+    if (window.__POWERED_BY_QIANKUN__) {
+      var pathname = (0, _lodash.replace)(window.location.pathname, (0, _umi.getCreateHistoryOptions)().basename, '');
+      headers['Mf-Path'] = pathname.length > 0 ? pathname : '/';
+      headers['Sys-Code'] = (0, _umi.getCreateHistoryOptions)().basename.split('/')[1];
+      if (window.routeCode) headers['Menu-Code'] = window.routeCode;
+    }
+    ;
     var formItemProps = {
       action: uploadUrl || getUrl('upload'),
       // 上传地址
-      headers: {
-        Authorization: "Bearer ".concat(window.cookie.get(window.appConfig.authSaveKey))
-      },
+      headers: headers,
       // 请求头
       name: 'files',
       multiple: true,

package/lib/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/lib/upload/FormItem/index.js

@@ -9,24 +9,26 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
+var _lodash = require("lodash");
 var _luckDesign = require("luck-design");
+var _umi = require("umi");
 var _utils = require("@luck-design-biz/base/utils");
 var _excluded = ["uploadUrl", "moduleCode", "bucket", "tag", "note", "config", "supportTypes", "forbiddenTypes", "children", "dataFormat", "listType"];
-/**
- * 表单类型富文本上传
- * 是否实体字段： 是
- * 是否接受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) {
@@ -51,6 +53,18 @@ function buildComponent(props) {
     return "".concat(window.appConfig.OSS_HOST_V3, "?moduleCode=").concat(moduleCode, "&behaviorKey=").concat(behaviorKey, "&bucket=").concat(bucket, "&tag=").concat(tag, "&note=").concat(note);
   };
   var supportUploadTypes = (0, _utils.getSupportUploadTypes)(forbiddenTypes, supportTypes);
+  var headers = {};
+  var token = window.cookie.get(window.appConfig.authSaveKey);
+  if (token) headers.Authorization = "Bearer ".concat(token);
+  var ticket = _umi.history.location.query.ticket;
+  if (ticket) headers.ticket = (0, _utils.string2ASCII)(ticket);
+  if (window.__POWERED_BY_QIANKUN__) {
+    var pathname = (0, _lodash.replace)(window.location.pathname, (0, _umi.getCreateHistoryOptions)().basename, '');
+    headers['Mf-Path'] = pathname.length > 0 ? pathname : '/';
+    headers['Sys-Code'] = (0, _umi.getCreateHistoryOptions)().basename.split('/')[1];
+    if (window.routeCode) headers['Menu-Code'] = window.routeCode;
+  }
+  ;
   return /*#__PURE__*/_react.default.createElement(_luckDesign.BasicFormItem, (0, _extends2.default)({
     extra: "".concat((0, _utils.formatMessage)({
       id: 'app.upload.supportUpload',
@@ -68,9 +82,7 @@ function buildComponent(props) {
       }),
       action: uploadUrl || getUrl('upload'),
       // 上传地址
-      headers: {
-        Authorization: "Bearer ".concat(window.cookie.get(window.appConfig.authSaveKey))
-      },
+      headers: headers,
       // 请求头
       name: 'files',
       // 发送到后台的文件名

package/lib/utils/form.js

@@ -26,11 +26,11 @@ var _excluded = ["comName", "property"],
   _excluded7 = ["formItemRewrite"],
   _excluded8 = ["name"],
   _excluded9 = ["type", "name"];
-/**
- * 根据动态表单配置项生成formItem
- * @param {动态表单配置项} props
- * @param {自定义动态表单配置项} customProps
- * @returns <BasicForm name='' ... />
+/**
+ * 根据动态表单配置项生成formItem
+ * @param {动态表单配置项} props
+ * @param {自定义动态表单配置项} customProps
+ * @returns <BasicForm name='' ... />
  */
 function getFormItem() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
@@ -64,11 +64,11 @@ function getFormItem() {
   }));
 }
 
-/**
- * 根据后端返回数据组装表单数据
- * @param {数组---动态表单配置参数列表} propsList
- * @param {对象---后端返回的未处理数据} values
- * @returns
+/**
+ * 根据后端返回数据组装表单数据
+ * @param {数组---动态表单配置参数列表} propsList
+ * @param {对象---后端返回的未处理数据} values
+ * @returns
  */
 var formItemDataFormat = exports.formItemDataFormat = function formItemDataFormat() {
   var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -138,11 +138,11 @@ var formItemDataFormat = exports.formItemDataFormat = function formItemDataForma
   return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, omitValues), data);
 };
 
-/**
- * 数据格式化
- * @param {数组---动态表单配置参数列表} propsList
- * @param {对象---表单获取到的未处理数据} values
- * @returns
+/**
+ * 数据格式化
+ * @param {数组---动态表单配置参数列表} propsList
+ * @param {对象---表单获取到的未处理数据} values
+ * @returns
  */
 var dataFormat = exports.dataFormat = function dataFormat() {
   var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -202,17 +202,17 @@ var dataFormat = exports.dataFormat = function dataFormat() {
       default:
         result[name] = values[name];
     }
-    values = (0, _lodash.omit)(values, [name, "".concat(name, "_cvt")]);
+    values = (0, _lodash.omit)(values, [name, "".concat(name, "_virtual")]);
   }, {});
   return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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: *}}
  */
 var getFormColumn = exports.getFormColumn = function getFormColumn() {
   var _props$config;
@@ -264,6 +264,7 @@ var getFormColumn = exports.getFormColumn = function getFormColumn() {
         key: name
       }, _props));
     },
-    field: name
+    field: name,
+    exportField: (0, _grid.getExportField)(name, formItemType, _props)
   });
 };