@luck-design-biz/luckda 0.0.22 → 0.0.24-1

package/es/upload/Form/gridForm.js

@@ -5,14 +5,14 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl", "wrapperRef"];
 import React, { useState, useRef, forwardRef } from 'react';
 import { getDvaApp } from 'umi';
-import { useMemoizedFn } from 'ahooks';
+import { useMemoizedFn, useCreation } from 'ahooks';
 import { Button, Upload, Tooltip, Icon } from 'luck-design/antd';
 import moment from 'moment';
 import { last } from 'lodash';
 import { BasicForm, BasicFormItem, PopWindow } from 'luck-design';
-import api from '@/services/ApiConfig';
+import api from "@/services/ApiConfig";
 import { FormBtn, GridForm } from '@luck-design-biz/base/FormList';
-import { byteConvert, formatMessage, beforeUpload as _beforeUpload2, patchDownloadZip, showPop, request, canPreview } from '@luck-design-biz/base/utils';
+import { byteConvert, formatMessage, beforeUpload as _beforeUpload2, getSupportUploadTypes, patchDownloadZip, showPop, request, canPreview } from '@luck-design-biz/base/utils';
 var columns = [{
   field: 'name',
   title: '附件名称'
@@ -77,6 +77,9 @@ var UploadGridForm = function UploadGridForm(_ref) {
   var gridRef = wrapperRef || useRef(null);
   var _getDvaApp$_store$get = (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store.getState().user,
     currentUser = _getDvaApp$_store$get.currentUser;
+  var supportUploadTypes = useCreation(function () {
+    return getSupportUploadTypes(forbiddenTypes);
+  }, [forbiddenTypes]);
 
   // 下载
   var downloadFile = function downloadFile(filenames, tag) {
@@ -158,7 +161,8 @@ var UploadGridForm = function UploadGridForm(_ref) {
       }).then(function (res) {
         var code = res.code,
           list = res.list,
-          detail = res.detail;
+          detail = res.detail,
+          msg = res.msg;
         if (code === 1) {
           setUploadLoading(false);
           setVisible(false);
@@ -185,6 +189,9 @@ var UploadGridForm = function UploadGridForm(_ref) {
               }, 300);
             }
           });
+        } else {
+          setUploadLoading(false);
+          showPop(msg, null, 'error');
         }
       });
     }
@@ -205,7 +212,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
         var upload = _beforeUpload2({
           file: file,
           fileList: fileList,
-          forbiddenTypes: forbiddenTypes,
+          supportUploadTypes: supportUploadTypes,
           beforeUpload: _beforeUpload
         });
         if (!upload) setUploadLoading(false);
@@ -228,7 +235,15 @@ var UploadGridForm = function UploadGridForm(_ref) {
     }, formatMessage({
       id: 'app.base.operate.add',
       label: '添加'
-    })) : /*#__PURE__*/React.createElement(FormBtn, {
+    })) : /*#__PURE__*/React.createElement(Tooltip, {
+      title: "".concat(formatMessage({
+        id: 'app.upload.supportUpload',
+        label: '支持上传'
+      })).concat(supportUploadTypes.join('，')).concat(formatMessage({
+        id: 'app.upload.supportUpload.type',
+        label: '类型的文件'
+      }))
+    }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(FormBtn, {
       formId: "formId"
     }, /*#__PURE__*/React.createElement(Upload, formItemProps, /*#__PURE__*/React.createElement(Button, {
       type: "primary",
@@ -239,7 +254,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
     }, formatMessage({
       id: 'app.base.operate.add',
       label: '添加'
-    }))))), /*#__PURE__*/React.createElement(Button, {
+    }))))))), /*#__PURE__*/React.createElement(Button, {
       type: "primary",
       onClick: function onClick() {
         var _gridRef$current$form;
@@ -344,6 +359,13 @@ var UploadGridForm = function UploadGridForm(_ref) {
     type: "upload",
     name: "files",
     label: "\u9644\u4EF6",
+    extra: "".concat(formatMessage({
+      id: 'app.upload.supportUpload',
+      label: '支持上传'
+    })).concat(supportUploadTypes.join('，')).concat(formatMessage({
+      id: 'app.upload.supportUpload.type',
+      label: '类型的文件'
+    })),
     config: _objectSpread(_objectSpread({}, rest), {}, {
       required: true,
       message: '请上传',
@@ -355,7 +377,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
         return _beforeUpload2({
           file: file,
           fileList: fileList,
-          forbiddenTypes: forbiddenTypes,
+          supportUploadTypes: supportUploadTypes,
           beforeUpload: _beforeUpload
         });
       }

package/es/upload/Form/index.js

@@ -4,7 +4,7 @@ var _excluded = ["formId", "moduleCode", "bucket", "note"];
 import React from 'react';
 import { omitBy, isNil } from 'lodash';
 import { stringify } from 'querystring';
-import GridForm from './gridForm';
+import GridForm from "./gridForm";
 import { request } from '@luck-design-biz/base/utils';
 function buildComponent(props) {
   var _formId = props.formId,

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

@@ -4,23 +4,24 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["uploadUrl", "moduleCode", "bucket", "tag", "note", "config", "forbiddenTypes", "children", "dataFormat", "listType"];
 import React from 'react';
 import { BasicFormItem } from 'luck-design';
-import { formatMessage, beforeUpload as _beforeUpload } from '@luck-design-biz/base/utils';
+import { formatMessage, beforeUpload as _beforeUpload, getSupportUploadTypes } from '@luck-design-biz/base/utils';
+import { useCreation } from 'ahooks';
 
-/**
- * 表单类型富文本上传
- * 是否实体字段： 是
- * 是否接受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) {
@@ -42,7 +43,18 @@ function buildComponent(props) {
   var getUrl = function getUrl(behaviorKey) {
     return "".concat(window.appConfig.OSS_HOST_V3, "?moduleCode=").concat(moduleCode, "&behaviorKey=").concat(behaviorKey, "&bucket=").concat(bucket, "&tag=").concat(tag, "&note=").concat(note);
   };
-  return /*#__PURE__*/React.createElement(BasicFormItem, _extends({}, rest, {
+  var supportUploadTypes = useCreation(function () {
+    return getSupportUploadTypes(forbiddenTypes);
+  }, [forbiddenTypes]);
+  return /*#__PURE__*/React.createElement(BasicFormItem, _extends({
+    extra: "".concat(formatMessage({
+      id: 'app.upload.supportUpload',
+      label: '支持上传'
+    })).concat(supportUploadTypes.join('，')).concat(formatMessage({
+      id: 'app.upload.supportUpload.type',
+      label: '类型的文件'
+    }))
+  }, rest, {
     type: "uploadV3",
     config: _objectSpread(_objectSpread({
       required: false,
@@ -68,7 +80,7 @@ function buildComponent(props) {
         return _beforeUpload({
           file: file,
           fileList: fileList,
-          forbiddenTypes: forbiddenTypes,
+          supportUploadTypes: supportUploadTypes,
           beforeUpload: config && config.beforeUpload
         });
       }

package/es/upload/index.js

@@ -1,3 +1,3 @@
-export { default as buildUploadForm } from './Form';
-export { default as buildUploadFormItem } from './FormItem';
-export { default as UploadGridCell } from './GridCell';
+export { default as buildUploadForm } from "./Form";
+export { default as buildUploadFormItem } from "./FormItem";
+export { default as UploadGridCell } from "./GridCell";

package/es/utils/action.js

@@ -2,7 +2,7 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 // 行为请求同一接口
-import { readBehaviorCall } from '../services';
+import { readBehaviorCall } from "../services";
 export function behaviorCall() {
   return _behaviorCall.apply(this, arguments);
 }

package/es/utils/form.js

@@ -13,16 +13,16 @@ var _excluded = ["comName", "property"],
 import React from 'react';
 import moment from 'moment';
 import { capitalize, merge, transform, isArray, omit, isNil, clone } from 'lodash';
-import api from '@/services/ApiConfig';
-import { defaultComName, translator, splitStrToObj, formatCustomProps } from '../helper/form';
-import { getColumnRender } from './grid';
-import * as formItemUtils from '../helper/FromItems';
+import api from "@/services/ApiConfig";
+import { defaultComName, translator, splitStrToObj, formatCustomProps } from "../helper/form";
+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] : {},
@@ -55,11 +55,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] : [];
@@ -97,7 +97,7 @@ export var formItemDataFormat = function formItemDataFormat() {
         result[name] = values[name] ? JSON.parse(values[name]) : undefined;
         break;
       case 'year':
-        result[name] = values["".concat(name, "_virtual")] ? moment(values["".concat(name, "_virtual")], 'YYYY') : undefined;
+        result[name] = values[name] ? moment(values[name], 'YYYY') : undefined;
         break;
       case 'radio':
         result[name] = values[name];
@@ -123,11 +123,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] : [];
@@ -186,12 +186,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/es/utils/grid.js

@@ -4,16 +4,16 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["comName", "property"],
   _excluded2 = ["name"],
   _excluded3 = ["filter", "filterParams"];
-import React from "react";
+import React from 'react';
 import { getDvaApp } from 'umi';
-import { merge, isNil, isArray, includes, capitalize } from 'lodash';
+import { merge, isNil, isArray, includes, capitalize, isString } from 'lodash';
 import { Switch, Tag } from 'luck-design/antd';
 import moment from 'moment';
-import UploadGridCell from '../upload/GridCell';
+import UploadGridCell from "../upload/GridCell";
 import { formatMessage } from '@luck-design-biz/base/utils';
-import api from '@/services/ApiConfig';
-import { defaultComName, translator, formatCustomProps, splitStrToObj } from '../helper/form';
-import * as formItemUtils from '../helper/FromItems';
+import api from "@/services/ApiConfig";
+import { defaultComName, translator, formatCustomProps, splitStrToObj } from "../helper/form";
+import * as formItemUtils from "../helper/FromItems";
 
 // const { dispatch } = getDvaApp()?._store;
 
@@ -28,7 +28,7 @@ export function getColumnRender(name, type) {
     case 'textarea':
       render = function render(text, record) {
         var _props$config;
-        return record["".concat(name, "_virtual")] || (((_props$config = props.config) === null || _props$config === void 0 ? void 0 : _props$config.precision) && text ? Number(text).toFixed(props.config.precision) : text);
+        return record["".concat(name, "_virtual")] || ((_props$config = props.config) !== null && _props$config !== void 0 && _props$config.precision && text ? Number(text).toFixed(props.config.precision) : text);
       };
       break;
     case 'date':
@@ -37,8 +37,8 @@ export function getColumnRender(name, type) {
       };
       break;
     case 'year':
-      render = function render(text, record) {
-        return record["".concat(name, "_virtual")] || (text ? moment(text).format('YYYY-MM-DD') : undefined);
+      render = function render(text) {
+        return text;
       };
       break;
     case 'user':
@@ -69,9 +69,9 @@ export function getColumnRender(name, type) {
       break;
     case 'region':
       render = function render(text, record) {
-        return record["".concat(name, "_virtual")] || text ? text.map(function (i) {
+        return record["".concat(name, "_virtual")] || (text ? (isString(text) ? JSON.parse(text) : text).map(function (i) {
           return i.name;
-        }).join('/') : undefined;
+        }).join('/') : undefined);
       };
       break;
     case 'upload':
@@ -175,14 +175,14 @@ export var getGridColumn = function getGridColumn() {
         data.filter = 'select';
         data.filterParams = {
           options: function options() {
-            var _getDvaApp, _getDvaApp$_store;
-            return (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 ? void 0 : (_getDvaApp$_store = _getDvaApp._store) === null || _getDvaApp$_store === void 0 ? void 0 : _getDvaApp$_store.dispatch({
+            var _getDvaApp;
+            return (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 || (_getDvaApp = _getDvaApp._store) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp.dispatch({
               type: 'global/getUser'
             });
           },
           searchData: function searchData(str) {
-            var _getDvaApp2, _getDvaApp2$_store;
-            return (_getDvaApp2 = getDvaApp()) === null || _getDvaApp2 === void 0 ? void 0 : (_getDvaApp2$_store = _getDvaApp2._store) === null || _getDvaApp2$_store === void 0 ? void 0 : _getDvaApp2$_store.dispatch({
+            var _getDvaApp2;
+            return (_getDvaApp2 = getDvaApp()) === null || _getDvaApp2 === void 0 || (_getDvaApp2 = _getDvaApp2._store) === null || _getDvaApp2 === void 0 ? void 0 : _getDvaApp2.dispatch({
               type: "global/getUser",
               payload: str
             });
@@ -197,8 +197,8 @@ export var getGridColumn = function getGridColumn() {
         if (_props.alias) {
           data.filterParams = {
             options: function options() {
-              var _getDvaApp3, _getDvaApp3$_store;
-              return (_getDvaApp3 = getDvaApp()) === null || _getDvaApp3 === void 0 ? void 0 : (_getDvaApp3$_store = _getDvaApp3._store) === null || _getDvaApp3$_store === void 0 ? void 0 : _getDvaApp3$_store.dispatch({
+              var _getDvaApp3;
+              return (_getDvaApp3 = getDvaApp()) === null || _getDvaApp3 === void 0 || (_getDvaApp3 = _getDvaApp3._store) === null || _getDvaApp3 === void 0 ? void 0 : _getDvaApp3.dispatch({
                 type: 'global/getDatadic',
                 payload: {
                   snamealias: _props.alias
@@ -213,8 +213,8 @@ export var getGridColumn = function getGridColumn() {
         data.filter = 'treeSelect';
         data.filterParams = {
           options: function options() {
-            var _getDvaApp4, _getDvaApp4$_store;
-            return (_getDvaApp4 = getDvaApp()) === null || _getDvaApp4 === void 0 ? void 0 : (_getDvaApp4$_store = _getDvaApp4._store) === null || _getDvaApp4$_store === void 0 ? void 0 : _getDvaApp4$_store.dispatch({
+            var _getDvaApp4;
+            return (_getDvaApp4 = getDvaApp()) === null || _getDvaApp4 === void 0 || (_getDvaApp4 = _getDvaApp4._store) === null || _getDvaApp4 === void 0 ? void 0 : _getDvaApp4.dispatch({
               type: 'global/readGroup',
               payload: {
                 sclassKey: _props.sclassKey
@@ -222,8 +222,8 @@ export var getGridColumn = function getGridColumn() {
             });
           },
           searchData: function searchData(str) {
-            var _getDvaApp5, _getDvaApp5$_store;
-            return (_getDvaApp5 = getDvaApp()) === null || _getDvaApp5 === void 0 ? void 0 : (_getDvaApp5$_store = _getDvaApp5._store) === null || _getDvaApp5$_store === void 0 ? void 0 : _getDvaApp5$_store.dispatch({
+            var _getDvaApp5;
+            return (_getDvaApp5 = getDvaApp()) === null || _getDvaApp5 === void 0 || (_getDvaApp5 = _getDvaApp5._store) === null || _getDvaApp5 === void 0 ? void 0 : _getDvaApp5.dispatch({
               type: 'global/readGroup',
               payload: {
                 sclassKey: _props.sclassKey,
@@ -255,8 +255,7 @@ export var getGridColumn = function getGridColumn() {
         case 'date':
           formItemProps = {
             dataFormat: function dataFormat(value) {
-              var _ref2;
-              return _ref2 = {}, _defineProperty(_ref2, name, value ? moment(value).valueOf() : undefined), _defineProperty(_ref2, "".concat(name, "_virtual"), value ? moment(value).format('YYYY-MM-DD HH:mm:ss') : undefined), _ref2;
+              return _defineProperty(_defineProperty({}, name, value ? moment(value).valueOf() : undefined), "".concat(name, "_virtual"), value ? moment(value).format('YYYY-MM-DD HH:mm:ss') : undefined);
             },
             inputFormat: function inputFormat(value, record, params) {
               return moment(record["".concat(name, "_virtual")], 'YYYY-MM-DD HH:mm:ss');
@@ -269,12 +268,11 @@ export var getGridColumn = function getGridColumn() {
           if (translateProps.multiple) {
             formItemProps = {
               dataFormat: function dataFormat(value) {
-                var _ref3;
-                return _ref3 = {}, _defineProperty(_ref3, name, value.map(function (v) {
+                return _defineProperty(_defineProperty({}, name, value.map(function (v) {
                   return v.value || v.key;
-                }).join(',')), _defineProperty(_ref3, "".concat(name, "_virtual"), value.map(function (v) {
+                }).join(',')), "".concat(name, "_virtual"), value.map(function (v) {
                   return v.label;
-                }).join(',')), _ref3;
+                }).join(','));
               },
               inputFormat: function inputFormat(value, record, params) {
                 return _defineProperty({}, name, splitStrToObj(value, record["".concat(name, "_virtual")]));
@@ -283,8 +281,7 @@ export var getGridColumn = function getGridColumn() {
           } else {
             formItemProps = {
               dataFormat: function dataFormat(value) {
-                var _ref5;
-                return _ref5 = {}, _defineProperty(_ref5, name, value ? value.value || value.key : undefined), _defineProperty(_ref5, "".concat(name, "_virtual"), value ? value.label : undefined), _ref5;
+                return _defineProperty(_defineProperty({}, name, value ? value.value || value.key : undefined), "".concat(name, "_virtual"), value ? value.label : undefined);
               },
               inputFormat: function inputFormat(value, record, params) {
                 return _defineProperty({}, name, !isNil(value) ? {

package/es/utils/index.js

@@ -1,3 +1,3 @@
-export * from './grid';
-export * from './form';
-export * from './action';
+export * from "./grid";
+export * from "./form";
+export * from "./action";

package/lib/components/Builder/index.js

@@ -17,8 +17,7 @@ var _LdPop = _interopRequireDefault(require("../LdPop"));
 var _services = require("../../services");
 var _action2 = require("../../helper/action");
 var _utils = require("@luck-design-biz/base/utils");
-var LuckDaContext = /*#__PURE__*/(0, _react.createContext)();
-exports.LuckDaContext = LuckDaContext;
+var LuckDaContext = exports.LuckDaContext = /*#__PURE__*/(0, _react.createContext)();
 var builder = function builder(WrappedComponent, moduleCode) {
   var Component = function Component(props) {
     if (!moduleCode) return (0, _utils.formatMessage)({
@@ -101,7 +100,7 @@ var builder = function builder(WrappedComponent, moduleCode) {
       var _props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       fieldProps.current = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, fieldProps.current), _props);
     };
-    if (loading) return 'loading...';
+    if (loading) return null;
     if (!moduleData) return (0, _utils.formatMessage)({
       id: 'luckda.module.loadFailed',
       label: '模块信息加载失败'
@@ -138,5 +137,4 @@ var builder = function builder(WrappedComponent, moduleCode) {
   };
   return Component;
 };
-var _default = builder;
-exports.default = _default;
+var _default = exports.default = builder;

package/lib/components/LdAutoForm/index.js

@@ -58,11 +58,10 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     var _defaultValues = {};
     var _nodes = (0, _lodash.transform)(columns, function (result, col) {
       if (col.isShowInForm) {
-        var _objectSpread2;
         var customFiled = filedsRewrite.find(function (field) {
           return field.name === col.aliaName;
         }) || {};
-        _defaultValues = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, _defaultValues), {}, (_objectSpread2 = {}, (0, _defineProperty2.default)(_objectSpread2, col.aliaName, col['optDefaultValue']), (0, _defineProperty2.default)(_objectSpread2, "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
+        _defaultValues = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, _defaultValues), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
         result.push((0, _utils.getFormItem)(col, (0, _objectSpread3.default)((0, _objectSpread3.default)({
           formId: ldId,
           moduleCode: moduleCode
@@ -109,7 +108,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
         var values = _ref3.values,
           submitData = _ref3.submitData;
         var _submitData = (0, _utils.dataFormat)(columns, submitData);
-        if (_onOperate === null || _onOperate === void 0 ? void 0 : _onOperate.post) return _onOperate.post({
+        if (_onOperate !== null && _onOperate !== void 0 && _onOperate.post) return _onOperate.post({
           values: values,
           submitData: _submitData
         }); // 以预设为主
@@ -121,16 +120,15 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     onQuery: (0, _objectSpread3.default)((0, _objectSpread3.default)({
       api: _utils.behaviorCall,
       get: function get(formData) {
-        var _params2;
         var _relationKey = isMain ? window.appConfig.constraintKeys.PRIMARY : relationKey;
-        var _params = (_params2 = {}, (0, _defineProperty2.default)(_params2, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][_relationKey] || ticketData[_relationKey]), (0, _defineProperty2.default)(_params2, "moduleCode", moduleCode), (0, _defineProperty2.default)(_params2, "datasetCode", dataSetKey), (0, _defineProperty2.default)(_params2, "behaviorKey", isMain ? 'readForm' : 'readUniqueForm'), _params2);
+        var _params = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][_relationKey] || ticketData[_relationKey]), "moduleCode", moduleCode), "datasetCode", dataSetKey), "behaviorKey", isMain ? 'readForm' : 'readUniqueForm');
         if (!isMain) _params.relationDs = mainDataSetKey;
         return _params;
       }
     }, onQuery), {}, {
       format: function format(data, res) {
         var formItemData = (0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns, data));
-        if (onQuery === null || onQuery === void 0 ? void 0 : onQuery.format) return onQuery.format(data, formItemData, res); // 以预设为主
+        if (onQuery !== null && onQuery !== void 0 && onQuery.format) return onQuery.format(data, formItemData, res); // 以预设为主
         return formItemData;
       }
     })
@@ -139,5 +137,4 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     onUpdate: onOperate(onUpdate, 'update')
   }, formConfig), basicItems);
 };
-var _default = (0, _ldBuilder.default)(buildLdAutoForm);
-exports.default = _default;
+var _default = exports.default = (0, _ldBuilder.default)(buildLdAutoForm);

package/lib/components/LdCard/index.js

@@ -143,10 +143,10 @@ var LdIndex = function LdIndex(_ref2) {
   });
   var Component = (0, _ahooks.useCreation)(function () {
     var _getDvaApp, _getDvaApp2;
-    (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp.unmodel(namespace);
-    if (!((_getDvaApp2 = (0, _umi.getDvaApp)()) === null || _getDvaApp2 === void 0 ? void 0 : _getDvaApp2._store.getState()[namespace])) {
+    (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 || _getDvaApp.unmodel(namespace);
+    if (!((_getDvaApp2 = (0, _umi.getDvaApp)()) !== null && _getDvaApp2 !== void 0 && _getDvaApp2._store.getState()[namespace])) {
       var _getDvaApp3;
-      (_getDvaApp3 = (0, _umi.getDvaApp)()) === null || _getDvaApp3 === void 0 ? void 0 : _getDvaApp3.model((0, _model.default)(namespace, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      (_getDvaApp3 = (0, _umi.getDvaApp)()) === null || _getDvaApp3 === void 0 || _getDvaApp3.model((0, _model.default)(namespace, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         isFlow: !!props.isFlow
       }, overModel), {}, {
         dataSetKey: props.dataSetKey,
@@ -186,7 +186,6 @@ Index.propTypes = {
   // 卡片行为
   cardKey: _propTypes.default.string // 卡片主键
 };
-
 Index.defaultProps = {
   resultSet: {},
   suppressInit: false,
@@ -201,9 +200,8 @@ Index.defaultProps = {
   overModel: {},
   cardKey: window.appConfig.constraintKeys.PRIMARY
 };
-var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+var _default = exports.default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   return /*#__PURE__*/_react.default.createElement(Index, (0, _extends2.default)({
     wrapperRef: ref
   }, props));
-});
-exports.default = _default;
+});

package/lib/components/LdCom/index.js

@@ -12,11 +12,9 @@ var _antd = require("luck-design/antd");
 var _base = require("@luck-design-biz/base");
 var _ldComBuild = require("../../helper/ldComBuild");
 var _excluded = ["options"];
-var LdButton = (0, _ldComBuild.ldComBuilder)(_antd.Button);
-exports.LdButton = LdButton;
-var LdCollapse = (0, _ldComBuild.ldComBuilder)(_base.Collapse);
-exports.LdCollapse = LdCollapse;
-var LdButtonRadio = function LdButtonRadio(_ref) {
+var LdButton = exports.LdButton = (0, _ldComBuild.ldComBuilder)(_antd.Button);
+var LdCollapse = exports.LdCollapse = (0, _ldComBuild.ldComBuilder)(_base.Collapse);
+var LdButtonRadio = exports.LdButtonRadio = function LdButtonRadio(_ref) {
   var _ref$options = _ref.options,
     options = _ref$options === void 0 ? [] : _ref$options,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
@@ -24,12 +22,9 @@ var LdButtonRadio = function LdButtonRadio(_ref) {
     options: (0, _ldComBuild.filterOptions)(options)
   }));
 };
-exports.LdButtonRadio = LdButtonRadio;
-var LdIconFont = (0, _ldComBuild.ldComBuilder)(_base.IconFont);
-exports.LdIconFont = LdIconFont;
-var LdTabs = (0, _ldComBuild.deepFilterCom)(_antd.Tabs, function (child) {
+var LdIconFont = exports.LdIconFont = (0, _ldComBuild.ldComBuilder)(_base.IconFont);
+var LdTabs = exports.LdTabs = (0, _ldComBuild.deepFilterCom)(_antd.Tabs, function (child) {
   var _child$type;
-  return (child === null || child === void 0 ? void 0 : (_child$type = child.type) === null || _child$type === void 0 ? void 0 : _child$type.displayName) === 'TabPane';
+  return (child === null || child === void 0 || (_child$type = child.type) === null || _child$type === void 0 ? void 0 : _child$type.displayName) === 'TabPane';
 });
-exports.LdTabs = LdTabs;
 LdTabs.TabPane = _antd.Tabs.TabPane;