@luck-design-biz/luckda 0.0.12-1 → 0.0.12-3

package/es/components/LdAutoForm/index.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "formRef", "formMode"];
+var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "formRef", "formMode", "formData"];
 import React, { useContext, useRef, useState } from 'react';
 import { useCreation, useMemoizedFn } from 'ahooks';
 import { transform } from 'lodash';
@@ -43,6 +43,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     ticketData = _ref$ticketData === void 0 ? {} : _ref$ticketData,
     formRef = _ref.formRef,
     formMode = _ref.formMode,
+    forwardFormData = _ref.formData,
     props = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = useContext(LuckDaContext) || {},
     setFieldProps = _ref2.setFieldProps;
@@ -61,7 +62,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
           formId: ldId,
           moduleCode: moduleCode,
           formRef: formRef,
-          formMode: formMode
+          formMode: formMode,
+          uid: forwardFormData[ldId][window.appConfig.constraintKeys.PRIMARY]
         }, customFiled), {}, {
           handleValueChange: function handleValueChange(value) {
             return onValueChange(_defineProperty({}, ldId, _defineProperty({}, col.field, value)));
@@ -87,8 +89,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     var behaviorKey = arguments.length > 1 ? arguments[1] : undefined;
     return _objectSpread(_objectSpread({
       api: function api(get, post, formData) {
-        var _formData$mainFormLdI;
-        post[dataSetKey][isMain ? 'indocno' : 'relationId'] = ((_formData$mainFormLdI = formData[mainFormLdId]) === null || _formData$mainFormLdI === void 0 ? void 0 : _formData$mainFormLdI.indocno) || ticketData.indocno;
+        post[dataSetKey][isMain ? 'indocno' : 'relationId'] = formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY];
         return behaviorCall(get, post, formData);
       },
       get: function get() {
@@ -117,8 +118,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     onQuery: _objectSpread(_objectSpread({
       api: behaviorCall,
       get: function get(formData) {
-        var _formData$mainFormLdI2, _params2;
-        var _params = (_params2 = {}, _defineProperty(_params2, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI2 = formData[mainFormLdId]) === null || _formData$mainFormLdI2 === void 0 ? void 0 : _formData$mainFormLdI2.indocno) || ticketData.indocno), _defineProperty(_params2, "moduleCode", moduleCode), _defineProperty(_params2, "datasetCode", dataSetKey), _defineProperty(_params2, "behaviorKey", 'readForm'), _params2);
+        var _params2;
+        var _params = (_params2 = {}, _defineProperty(_params2, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY]), _defineProperty(_params2, "moduleCode", moduleCode), _defineProperty(_params2, "datasetCode", dataSetKey), _defineProperty(_params2, "behaviorKey", 'readForm'), _params2);
         if (!isMain) _params.relationDs = mainDataSetKey;
         return _params;
       }

package/es/components/LdCard/index.js

@@ -174,7 +174,9 @@ Index.propTypes = {
   // 卡片配置项
   onOperationsClick: PropTypes.func,
   // 操作
-  cardActions: PropTypes.array // 卡片行为
+  cardActions: PropTypes.array,
+  // 卡片行为
+  cardKey: PropTypes.string // 卡片主键
 };
 
 Index.defaultProps = {
@@ -183,12 +185,13 @@ Index.defaultProps = {
   isFlow: false,
   cardConfig: {},
   formatDataSource: function formatDataSource(_list, _detail) {
-    return _list.map(function (indocno) {
-      return _detail[indocno];
+    return _list.map(function (id) {
+      return _detail[id];
     });
   },
   cardActions: [],
-  overModel: {}
+  overModel: {},
+  cardKey: window.appConfig.constraintKeys.PRIMARY
 };
 export default /*#__PURE__*/forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement(Index, _extends({

package/es/components/LdFormList/index.js

@@ -7,12 +7,11 @@ var _excluded = ["namespace", "formState", "formMode", "loading", "wrapperRef",
   _excluded2 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
   _excluded3 = ["ldId", "initData", "overModel"];
 import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState } from 'react';
-import { stringify } from 'querystring';
-import { connect, getDvaApp, useRouteMatch, history } from 'umi';
+import { connect, getDvaApp, useRouteMatch } from 'umi';
 import PropTypes from 'prop-types';
 import { useCreation, useMemoizedFn } from 'ahooks';
 import { BasicDivider } from 'luck-design';
-import { formatMessage, ChildrenUtil } from '@luck-design-biz/base/utils';
+import { ChildrenUtil } from '@luck-design-biz/base/utils';
 import { FormList, FormListAffix, FormBtn } from '@luck-design-biz/base/FormList';
 import buildLdAutoForm from '../LdAutoForm';
 import buildLdGridForm from '../LdGridForm';
@@ -108,11 +107,11 @@ var LdFormList = function LdFormList(_ref) {
       formData: props.formData,
       form_id: formKey,
       effcode: formCode
-    }, function (success, indocno, res) {
+    }, function (success, mainKey, res) {
       setSubmitLoading(false);
       if (success) {
         if (afterSubmit) {
-          afterSubmit(success, indocno, res);
+          afterSubmit(success, mainKey, res);
         } else {
           var _formListRef$current;
           props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
@@ -129,9 +128,7 @@ var LdFormList = function LdFormList(_ref) {
           //     })}`,
           //   );
           // } else {
-          formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, {
-            indocno: indocno
-          }), function () {
+          formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, _defineProperty({}, window.appConfig.constraintKeys.PRIMARY, mainKey)), function () {
             return formListRef.current.setFormMode('info');
           });
           // }
@@ -207,6 +204,7 @@ var LdFormList = function LdFormList(_ref) {
       ticketData: props.ticketData,
       formRef: formListRef,
       formMode: formMode,
+      formData: props.formData,
       renderTopLeft: function renderTopLeft() {
         return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
       }
@@ -229,6 +227,7 @@ var LdFormList = function LdFormList(_ref) {
       ticketData: props.ticketData,
       formRef: formListRef,
       formMode: formMode,
+      formData: props.formData,
       renderTopLeft: function renderTopLeft() {
         return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'graphic'), _renderTopLeft()];
       }

package/es/components/LdGrid/index.js

@@ -206,7 +206,9 @@ Index.propTypes = {
   // 行操作
   suppressInit: PropTypes.bool,
   // 抑制初始化
-  afterInit: PropTypes.func // 初始化后
+  afterInit: PropTypes.func,
+  // 初始化后
+  rowKey: PropTypes.string // 初始化后
 };
 
 Index.defaultProps = {
@@ -214,14 +216,15 @@ Index.defaultProps = {
   columnsReset: null,
   batchOperations: [],
   formatDataSource: function formatDataSource(_list, _detail) {
-    return _list.map(function (indocno) {
-      return _detail[indocno];
+    return _list.map(function (id) {
+      return _detail[id];
     });
   },
   resultSet: {},
   suppressInit: false,
   isFlow: false,
-  overModel: {}
+  overModel: {},
+  rowKey: window.appConfig.constraintKeys.PRIMARY
 };
 export default /*#__PURE__*/forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement(Index, _extends({

package/es/components/LdGridForm/index.js

@@ -102,8 +102,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     var behaviorKey = arguments.length > 1 ? arguments[1] : undefined;
     return _objectSpread(_objectSpread({
       api: function api(get, post, formData) {
-        var _formData$mainFormLdI;
-        return behaviorCall(_objectSpread(_objectSpread({}, get), {}, _defineProperty({}, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI = formData[mainFormLdId]) === null || _formData$mainFormLdI === void 0 ? void 0 : _formData$mainFormLdI.indocno) || ticketData.indocno)), post, formData);
+        return behaviorCall(_objectSpread(_objectSpread({}, get), {}, _defineProperty({}, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY])), post, formData);
       },
       get: function get() {
         var _get = {
@@ -136,8 +135,8 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     onQuery: _objectSpread(_objectSpread({
       api: behaviorCall,
       get: function get(formData) {
-        var _formData$mainFormLdI2, _params2;
-        var _params = (_params2 = {}, _defineProperty(_params2, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI2 = formData[mainFormLdId]) === null || _formData$mainFormLdI2 === void 0 ? void 0 : _formData$mainFormLdI2.indocno) || ticketData.indocno), _defineProperty(_params2, "moduleCode", moduleCode), _defineProperty(_params2, "datasetCode", dataSetKey), _defineProperty(_params2, "behaviorKey", 'readGrid'), _params2);
+        var _params2;
+        var _params = (_params2 = {}, _defineProperty(_params2, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY]), _defineProperty(_params2, "moduleCode", moduleCode), _defineProperty(_params2, "datasetCode", dataSetKey), _defineProperty(_params2, "behaviorKey", 'readGrid'), _params2);
         if (!isMain) _params.relationDs = mainDataSetKey;
         return _params;
       }
@@ -156,7 +155,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
       post: function post(data) {
         var _submitData = data.map(function (item) {
           return {
-            indocno: item.indocno
+            indocno: item[window.appConfig.constraintKeys.PRIMARY]
           };
         });
         if (onDelete === null || onDelete === void 0 ? void 0 : onDelete.post) return onDelete.post(_submitData); // 以预设为主

package/es/components/LdTree/index.js

@@ -3,7 +3,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"],
+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"],
   _excluded2 = ["onClick"];
 import React, { useState, useRef, useImperativeHandle, forwardRef } from 'react';
 import { isFunction, isNumber, transform, includes, remove, cloneDeep, keys } from 'lodash';
@@ -44,6 +44,7 @@ var LdTree = function LdTree(_ref) {
     afterInit = _ref.afterInit,
     isTree = _ref.isTree,
     service = _ref.service,
+    dataToTreeFormat = _ref.dataToTreeFormat,
     props = _objectWithoutProperties(_ref, _excluded);
   if (!includes(isTree, dataSetKey)) return formatMessage({
     id: 'luckda.ldTree.notTres',
@@ -89,7 +90,7 @@ var LdTree = function LdTree(_ref) {
               defaultExpandedKeys: defaultExpanded
             });
           }
-          var treeData = dataToTree(data);
+          var treeData = dataToTreeFormat ? dataToTreeFormat(data) : dataToTree(data, null, rowKey, window.appConfig.constraintKeys.PARENT);
           setDataSource(treeData);
           afterInit && afterInit(treeData);
         }
@@ -227,7 +228,7 @@ Index.propTypes = {
 Index.defaultProps = {
   readOnly: false,
   title: false,
-  rowKey: 'indocno',
+  rowKey: window.appConfig.constraintKeys.PRIMARY,
   treeNodeTitle: 'sname',
   defaultExpandDeep: 0,
   draggable: false,

package/es/helper/FromItems.js

@@ -302,8 +302,10 @@ export var getUploadItem = function getUploadItem() {
     props = _objectWithoutProperties(_ref14, _excluded24);
   return /*#__PURE__*/React.createElement(UploadFormItemV3, _extends({}, props, {
     config: _objectSpread(_objectSpread({
-      listType: 'picture-card'
+      listType: 'picture-card',
+      accept: 'image/*'
     }, _config), {}, {
+      num: 1,
       onBlur: function onBlur(value) {
         handleValueChange && handleValueChange(value);
         _onBlur5 && _onBlur5(value);

package/es/helper/action.js

@@ -80,10 +80,15 @@ export var doAction = function doAction(action) {
     };
     showConfirm ? makeSure(handleAction) : handleAction();
   } else {
-    showPop(formatMessage({
-      id: 'luckda.operates.message.noAction',
-      label: '该模块下缺少此行为'
+    var errorMsg = "".concat(formatMessage({
+      id: 'luckda.module.miss',
+      label: '该模块下缺少'
+    })).concat(action).concat(formatMessage({
+      id: 'luckda.operates.Action',
+      label: '行为'
     }));
+    console.error(errorMsg);
+    showPop(errorMsg);
   }
 };
 export var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
@@ -104,13 +109,13 @@ export var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
     form_id = _ref3.form_id,
     effcode = _ref3.effcode;
   var data = transform(formList, function (result, value) {
-    var _formData$value$id, _values$value$id;
+    var _values$value$id;
     if (values[value.id]) {
       var _dataSetKey = value.dataSetKey;
       switch (value.type) {
         case 'auto':
           result[_dataSetKey] = _objectSpread({
-            indocno: (_formData$value$id = formData[value.id]) === null || _formData$value$id === void 0 ? void 0 : _formData$value$id.indocno
+            indocno: formData[value.id] && formData[value.id][window.appConfig.constraintKeys.PRIMARY]
           }, dataFormat(dataSets[_dataSetKey], (_values$value$id = values[value.id]) === null || _values$value$id === void 0 ? void 0 : _values$value$id.submitData));
           break;
         case 'grid':

package/es/helper/form.js

@@ -9,6 +9,7 @@ export var defaultComName = {
   number: 'number',
   money: 'number',
   decimal: 'number',
+  sint: 'number',
   string: 'string',
   text: 'textarea',
   date: 'date',
@@ -20,7 +21,8 @@ export var defaultComName = {
   color: 'color',
   zone: 'region',
   year: 'year',
-  rte: 'editor'
+  rte: 'editor',
+  file: 'upload'
 };
 
 /**

package/es/utils/form.js

@@ -30,6 +30,7 @@ export function getFormItem() {
     props = _objectWithoutProperties(_ref, _excluded);
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   if (!property) return /*#__PURE__*/React.createElement(React.Fragment, null);
+  if (property === 'sint') props.opt_decimal = 0;
   var _translator = translator(props),
     name = _translator.name,
     translateProps = _objectWithoutProperties(_translator, _excluded2);
@@ -62,6 +63,7 @@ export function getFormItem() {
 export var formItemDataFormat = function formItemDataFormat() {
   var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var omitValues = {};
   var data = transform(propsList, function (result, n) {
     var _values$name, _values$name2;
     var _ref2 = n || {},
@@ -106,9 +108,9 @@ export var formItemDataFormat = function formItemDataFormat() {
       default:
         if (!isNil(values["".concat(name, "_virtual")] || values[name])) result[name] = values["".concat(name, "_virtual")] || values[name];
     }
-    values = omit(values, [name, "".concat(name, "_virtual")]);
+    omitValues = omit(values, [name, "".concat(name, "_virtual")]);
   }, {});
-  return _objectSpread(_objectSpread({}, values), data);
+  return _objectSpread(_objectSpread({}, omitValues), data);
 };
 
 /**

package/lib/components/LdAutoForm/index.js

@@ -17,7 +17,7 @@ var _FormList = require("@luck-design-biz/base/FormList");
 var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
 var _utils = require("../../utils");
 var _Builder = require("../Builder");
-var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "formRef", "formMode"];
+var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "formRef", "formMode", "formData"];
 var defaultOpe = ['read', 'add', 'update', 'delete'];
 var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var _ref$columns = _ref.columns,
@@ -51,6 +51,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     ticketData = _ref$ticketData === void 0 ? {} : _ref$ticketData,
     formRef = _ref.formRef,
     formMode = _ref.formMode,
+    forwardFormData = _ref.formData,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var _ref2 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
     setFieldProps = _ref2.setFieldProps;
@@ -69,7 +70,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
           formId: ldId,
           moduleCode: moduleCode,
           formRef: formRef,
-          formMode: formMode
+          formMode: formMode,
+          uid: forwardFormData[ldId][window.appConfig.constraintKeys.PRIMARY]
         }, customFiled), {}, {
           handleValueChange: function handleValueChange(value) {
             return onValueChange((0, _defineProperty2.default)({}, ldId, (0, _defineProperty2.default)({}, col.field, value)));
@@ -95,8 +97,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     var behaviorKey = arguments.length > 1 ? arguments[1] : undefined;
     return (0, _objectSpread3.default)((0, _objectSpread3.default)({
       api: function api(get, post, formData) {
-        var _formData$mainFormLdI;
-        post[dataSetKey][isMain ? 'indocno' : 'relationId'] = ((_formData$mainFormLdI = formData[mainFormLdId]) === null || _formData$mainFormLdI === void 0 ? void 0 : _formData$mainFormLdI.indocno) || ticketData.indocno;
+        post[dataSetKey][isMain ? 'indocno' : 'relationId'] = formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY];
         return (0, _utils.behaviorCall)(get, post, formData);
       },
       get: function get() {
@@ -125,8 +126,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     onQuery: (0, _objectSpread3.default)((0, _objectSpread3.default)({
       api: _utils.behaviorCall,
       get: function get(formData) {
-        var _formData$mainFormLdI2, _params2;
-        var _params = (_params2 = {}, (0, _defineProperty2.default)(_params2, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI2 = formData[mainFormLdId]) === null || _formData$mainFormLdI2 === void 0 ? void 0 : _formData$mainFormLdI2.indocno) || ticketData.indocno), (0, _defineProperty2.default)(_params2, "moduleCode", moduleCode), (0, _defineProperty2.default)(_params2, "datasetCode", dataSetKey), (0, _defineProperty2.default)(_params2, "behaviorKey", 'readForm'), _params2);
+        var _params2;
+        var _params = (_params2 = {}, (0, _defineProperty2.default)(_params2, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY]), (0, _defineProperty2.default)(_params2, "moduleCode", moduleCode), (0, _defineProperty2.default)(_params2, "datasetCode", dataSetKey), (0, _defineProperty2.default)(_params2, "behaviorKey", 'readForm'), _params2);
         if (!isMain) _params.relationDs = mainDataSetKey;
         return _params;
       }

package/lib/components/LdCard/index.js

@@ -182,7 +182,9 @@ Index.propTypes = {
   // 卡片配置项
   onOperationsClick: _propTypes.default.func,
   // 操作
-  cardActions: _propTypes.default.array // 卡片行为
+  cardActions: _propTypes.default.array,
+  // 卡片行为
+  cardKey: _propTypes.default.string // 卡片主键
 };
 
 Index.defaultProps = {
@@ -191,12 +193,13 @@ Index.defaultProps = {
   isFlow: false,
   cardConfig: {},
   formatDataSource: function formatDataSource(_list, _detail) {
-    return _list.map(function (indocno) {
-      return _detail[indocno];
+    return _list.map(function (id) {
+      return _detail[id];
     });
   },
   cardActions: [],
-  overModel: {}
+  overModel: {},
+  cardKey: window.appConfig.constraintKeys.PRIMARY
 };
 var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   return /*#__PURE__*/_react.default.createElement(Index, (0, _extends2.default)({

package/lib/components/LdFormList/index.js

@@ -12,7 +12,6 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
-var _querystring = require("querystring");
 var _umi = require("umi");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _ahooks = require("ahooks");
@@ -115,11 +114,11 @@ var LdFormList = function LdFormList(_ref) {
       formData: props.formData,
       form_id: formKey,
       effcode: formCode
-    }, function (success, indocno, res) {
+    }, function (success, mainKey, res) {
       setSubmitLoading(false);
       if (success) {
         if (afterSubmit) {
-          afterSubmit(success, indocno, res);
+          afterSubmit(success, mainKey, res);
         } else {
           var _formListRef$current;
           props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
@@ -136,9 +135,7 @@ var LdFormList = function LdFormList(_ref) {
           //     })}`,
           //   );
           // } else {
-          formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, {
-            indocno: indocno
-          }), function () {
+          formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, mainKey)), function () {
             return formListRef.current.setFormMode('info');
           });
           // }
@@ -214,6 +211,7 @@ var LdFormList = function LdFormList(_ref) {
       ticketData: props.ticketData,
       formRef: formListRef,
       formMode: formMode,
+      formData: props.formData,
       renderTopLeft: function renderTopLeft() {
         return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
       }
@@ -236,6 +234,7 @@ var LdFormList = function LdFormList(_ref) {
       ticketData: props.ticketData,
       formRef: formListRef,
       formMode: formMode,
+      formData: props.formData,
       renderTopLeft: function renderTopLeft() {
         return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'graphic'), _renderTopLeft()];
       }

package/lib/components/LdGrid/index.js

@@ -214,7 +214,9 @@ Index.propTypes = {
   // 行操作
   suppressInit: _propTypes.default.bool,
   // 抑制初始化
-  afterInit: _propTypes.default.func // 初始化后
+  afterInit: _propTypes.default.func,
+  // 初始化后
+  rowKey: _propTypes.default.string // 初始化后
 };
 
 Index.defaultProps = {
@@ -222,14 +224,15 @@ Index.defaultProps = {
   columnsReset: null,
   batchOperations: [],
   formatDataSource: function formatDataSource(_list, _detail) {
-    return _list.map(function (indocno) {
-      return _detail[indocno];
+    return _list.map(function (id) {
+      return _detail[id];
     });
   },
   resultSet: {},
   suppressInit: false,
   isFlow: false,
-  overModel: {}
+  overModel: {},
+  rowKey: window.appConfig.constraintKeys.PRIMARY
 };
 var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   return /*#__PURE__*/_react.default.createElement(Index, (0, _extends2.default)({

package/lib/components/LdGridForm/index.js

@@ -110,8 +110,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     var behaviorKey = arguments.length > 1 ? arguments[1] : undefined;
     return (0, _objectSpread4.default)((0, _objectSpread4.default)({
       api: function api(get, post, formData) {
-        var _formData$mainFormLdI;
-        return (0, _utils.behaviorCall)((0, _objectSpread4.default)((0, _objectSpread4.default)({}, get), {}, (0, _defineProperty2.default)({}, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI = formData[mainFormLdId]) === null || _formData$mainFormLdI === void 0 ? void 0 : _formData$mainFormLdI.indocno) || ticketData.indocno)), post, formData);
+        return (0, _utils.behaviorCall)((0, _objectSpread4.default)((0, _objectSpread4.default)({}, get), {}, (0, _defineProperty2.default)({}, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY])), post, formData);
       },
       get: function get() {
         var _get = {
@@ -144,8 +143,8 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     onQuery: (0, _objectSpread4.default)((0, _objectSpread4.default)({
       api: _utils.behaviorCall,
       get: function get(formData) {
-        var _formData$mainFormLdI2, _params2;
-        var _params = (_params2 = {}, (0, _defineProperty2.default)(_params2, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI2 = formData[mainFormLdId]) === null || _formData$mainFormLdI2 === void 0 ? void 0 : _formData$mainFormLdI2.indocno) || ticketData.indocno), (0, _defineProperty2.default)(_params2, "moduleCode", moduleCode), (0, _defineProperty2.default)(_params2, "datasetCode", dataSetKey), (0, _defineProperty2.default)(_params2, "behaviorKey", 'readGrid'), _params2);
+        var _params2;
+        var _params = (_params2 = {}, (0, _defineProperty2.default)(_params2, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY]), (0, _defineProperty2.default)(_params2, "moduleCode", moduleCode), (0, _defineProperty2.default)(_params2, "datasetCode", dataSetKey), (0, _defineProperty2.default)(_params2, "behaviorKey", 'readGrid'), _params2);
         if (!isMain) _params.relationDs = mainDataSetKey;
         return _params;
       }
@@ -164,7 +163,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
       post: function post(data) {
         var _submitData = data.map(function (item) {
           return {
-            indocno: item.indocno
+            indocno: item[window.appConfig.constraintKeys.PRIMARY]
           };
         });
         if (onDelete === null || onDelete === void 0 ? void 0 : onDelete.post) return onDelete.post(_submitData); // 以预设为主

package/lib/components/LdTree/index.js

@@ -23,7 +23,7 @@ var _base = require("@luck-design-biz/base");
 var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
 var _utils2 = require("../../utils");
 var _index = _interopRequireDefault(require("./index.less"));
-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"],
+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"],
   _excluded2 = ["onClick"];
 var LdTree = function LdTree(_ref) {
   var columns = _ref.columns,
@@ -52,6 +52,7 @@ var LdTree = function LdTree(_ref) {
     afterInit = _ref.afterInit,
     isTree = _ref.isTree,
     service = _ref.service,
+    dataToTreeFormat = _ref.dataToTreeFormat,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   if (!(0, _lodash.includes)(isTree, dataSetKey)) return (0, _utils.formatMessage)({
     id: 'luckda.ldTree.notTres',
@@ -97,7 +98,7 @@ var LdTree = function LdTree(_ref) {
               defaultExpandedKeys: defaultExpanded
             });
           }
-          var treeData = (0, _utils.dataToTree)(data);
+          var treeData = dataToTreeFormat ? dataToTreeFormat(data) : (0, _utils.dataToTree)(data, null, rowKey, window.appConfig.constraintKeys.PARENT);
           setDataSource(treeData);
           afterInit && afterInit(treeData);
         }
@@ -235,7 +236,7 @@ Index.propTypes = {
 Index.defaultProps = {
   readOnly: false,
   title: false,
-  rowKey: 'indocno',
+  rowKey: window.appConfig.constraintKeys.PRIMARY,
   treeNodeTitle: 'sname',
   defaultExpandDeep: 0,
   draggable: false,

package/lib/helper/FromItems.js

@@ -323,8 +323,10 @@ var getUploadItem = function getUploadItem() {
     props = (0, _objectWithoutProperties2.default)(_ref14, _excluded24);
   return /*#__PURE__*/_react.default.createElement(_base.UploadFormItemV3, (0, _extends2.default)({}, props, {
     config: (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      listType: 'picture-card'
+      listType: 'picture-card',
+      accept: 'image/*'
     }, _config), {}, {
+      num: 1,
       onBlur: function onBlur(value) {
         handleValueChange && handleValueChange(value);
         _onBlur5 && _onBlur5(value);

package/lib/helper/action.js

@@ -87,10 +87,15 @@ var doAction = function doAction(action) {
     };
     showConfirm ? makeSure(handleAction) : handleAction();
   } else {
-    (0, _utils.showPop)((0, _utils.formatMessage)({
-      id: 'luckda.operates.message.noAction',
-      label: '该模块下缺少此行为'
+    var errorMsg = "".concat((0, _utils.formatMessage)({
+      id: 'luckda.module.miss',
+      label: '该模块下缺少'
+    })).concat(action).concat((0, _utils.formatMessage)({
+      id: 'luckda.operates.Action',
+      label: '行为'
     }));
+    console.error(errorMsg);
+    (0, _utils.showPop)(errorMsg);
   }
 };
 exports.doAction = doAction;
@@ -112,13 +117,13 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
     form_id = _ref3.form_id,
     effcode = _ref3.effcode;
   var data = (0, _lodash.transform)(formList, function (result, value) {
-    var _formData$value$id, _values$value$id;
+    var _values$value$id;
     if (values[value.id]) {
       var _dataSetKey = value.dataSetKey;
       switch (value.type) {
         case 'auto':
           result[_dataSetKey] = (0, _objectSpread2.default)({
-            indocno: (_formData$value$id = formData[value.id]) === null || _formData$value$id === void 0 ? void 0 : _formData$value$id.indocno
+            indocno: formData[value.id] && formData[value.id][window.appConfig.constraintKeys.PRIMARY]
           }, (0, _utils2.dataFormat)(dataSets[_dataSetKey], (_values$value$id = values[value.id]) === null || _values$value$id === void 0 ? void 0 : _values$value$id.submitData));
           break;
         case 'grid':

package/lib/helper/form.js

@@ -18,6 +18,7 @@ var defaultComName = {
   number: 'number',
   money: 'number',
   decimal: 'number',
+  sint: 'number',
   string: 'string',
   text: 'textarea',
   date: 'date',
@@ -29,7 +30,8 @@ var defaultComName = {
   color: 'color',
   zone: 'region',
   year: 'year',
-  rte: 'editor'
+  rte: 'editor',
+  file: 'upload'
 };
 
 /**

package/lib/utils/form.js

@@ -38,6 +38,7 @@ function getFormItem() {
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   if (!property) return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
+  if (property === 'sint') props.opt_decimal = 0;
   var _translator = (0, _form.translator)(props),
     name = _translator.name,
     translateProps = (0, _objectWithoutProperties2.default)(_translator, _excluded2);
@@ -70,6 +71,7 @@ function getFormItem() {
 var formItemDataFormat = function formItemDataFormat() {
   var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var omitValues = {};
   var data = (0, _lodash.transform)(propsList, function (result, n) {
     var _values$name, _values$name2;
     var _ref2 = n || {},
@@ -114,9 +116,9 @@ var formItemDataFormat = function formItemDataFormat() {
       default:
         if (!(0, _lodash.isNil)(values["".concat(name, "_virtual")] || values[name])) result[name] = values["".concat(name, "_virtual")] || values[name];
     }
-    values = (0, _lodash.omit)(values, [name, "".concat(name, "_virtual")]);
+    omitValues = (0, _lodash.omit)(values, [name, "".concat(name, "_virtual")]);
   }, {});
-  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, values), data);
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, omitValues), data);
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "0.0.12-1",
+  "version": "0.0.12-3",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",