@luck-design-biz/luckda 0.0.25-7 → 0.0.25-9

package/es/components/ComplexItem/index.js

@@ -0,0 +1,92 @@
+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 _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["wrapperRef", "config", "renderInfoMode", "complexConfig"];
+import React, { useState, forwardRef } from 'react';
+import { getDvaApp } from 'umi';
+import { Tag } from 'luck-design/antd';
+import { isArray } from 'lodash';
+import { TreeSelector } from '@luck-design-biz/base';
+import { formatMessage, dataToTree } from '@luck-design-biz/base/utils';
+import { BasicFormItem } from 'luck-design';
+import api from "@/services/ApiConfig";
+import { fetchContent } from "./service";
+var Index = function Index(_ref) {
+  var wrapperRef = _ref.wrapperRef,
+    _ref$config = _ref.config,
+    config = _ref$config === void 0 ? {} : _ref$config,
+    renderInfoMode = _ref.renderInfoMode,
+    _ref$complexConfig = _ref.complexConfig,
+    _ref$complexConfig$is = _ref$complexConfig.isTree,
+    isTree = _ref$complexConfig$is === void 0 ? false : _ref$complexConfig$is,
+    moduleCode = _ref$complexConfig.moduleCode,
+    dataModel = _ref$complexConfig.dataModel,
+    dataSetCode = _ref$complexConfig.dataSetCode,
+    keyField = _ref$complexConfig.keyField,
+    valueField = _ref$complexConfig.valueField,
+    props = _objectWithoutProperties(_ref, _excluded);
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    dataSource = _useState2[0],
+    setDataSource = _useState2[1];
+  var handleFocus = function handleFocus() {
+    if (!dataSource || dataSource.length === 0) {
+      fetchContent(dataModel, {
+        datasetCode: dataSetCode,
+        moduleCode: moduleCode
+      }).then(function (res) {
+        var code = res.code,
+          data = res.data;
+        if (code === 1) {
+          var formatData = data.map(function (i) {
+            return _objectSpread(_objectSpread({}, i), {}, {
+              key: i[keyField],
+              value: i[keyField],
+              label: valueField.length > 0 ? valueField.split(',').map(function (val) {
+                return i[val];
+              }).join('-') : '',
+              title: valueField.length > 0 ? valueField.split(',').map(function (val) {
+                return i[val];
+              }).join('-') : ''
+            });
+          });
+          if (isTree) {
+            setDataSource(dataToTree(formatData, null, 'uid', 'parent_uid'));
+          } else setDataSource(formatData);
+        }
+      });
+    }
+  };
+  return renderInfoMode ? renderInfoMode(function (value) {
+    return (config.multiple || config.mode === 'multiple') && isArray(value) ? value.map(function (item) {
+      return /*#__PURE__*/React.createElement(Tag, {
+        key: item.key
+      }, item.label || item.value || item.key);
+    }) : /*#__PURE__*/React.createElement("span", null, value.label || value.value || value.key);
+  }) : /*#__PURE__*/React.createElement(BasicFormItem, _extends({}, props, {
+    type: isTree ? 'treeSelect' : 'select',
+    ref: wrapperRef,
+    config: _objectSpread(_objectSpread({
+      required: false,
+      placeholder: formatMessage({
+        id: 'app.base.tip.select'
+      }),
+      message: formatMessage({
+        id: 'app.base.tip.select'
+      })
+    }, config), {}, _defineProperty(_defineProperty({
+      showSearch: true,
+      optionFilterProp: 'title',
+      treeNodeFilterProp: 'label'
+    }, isTree ? 'treeData' : 'dataSource', dataSource), "onFocus", handleFocus))
+  }));
+};
+var RefCom = /*#__PURE__*/forwardRef(function (props, ref) {
+  return /*#__PURE__*/React.createElement(Index, _extends({
+    wrapperRef: ref
+  }, props));
+});
+RefCom.displayName = 'BasicFormItem';
+export default RefCom;

package/es/components/ComplexItem/service.js

@@ -0,0 +1,21 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import { stringify } from 'qs';
+import { request } from '@luck-design-biz/base/utils';
+import api from "@/services/ApiConfig";
+export var fetchContent = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(dmCode, get) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", request("".concat(api.API_HOST, "/").concat(dmCode, "/ui/builder/complex/noAuthFetchContent?").concat(stringify(get))));
+        case 1:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function fetchContent(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();

package/es/components/LDActions/index.js

@@ -1,5 +1,4 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
@@ -10,7 +9,7 @@ import { useCreation, useMemoizedFn } from 'ahooks';
 import { Modal, recheck } from '@luck-design-biz/base';
 import { Button, Menu, Dropdown, Icon, Divider } from 'luck-design/antd';
 import classNames from 'classnames';
-import { reduce } from 'lodash';
+import { reduce, isNil } from 'lodash';
 import { getResources } from "../../helper/ldComBuild";
 import styles from "./index.less";
 var DisplayComp = function DisplayComp(_ref) {
@@ -64,22 +63,21 @@ var LDActions = function LDActions(_ref2) {
   });
   var actionMap = useCreation(function () {
     return reduce(todoList, function (ret, action, index) {
-      ret[action.serial] = _objectSpread(_objectSpread({}, action), {}, {
-        serialValue: Math.pow(2, index)
-      });
+      if (!isNil(action.serial) && !ret[action.serial]) {
+        ret[action.serial] = Math.pow(2, index);
+      }
       return ret;
     }, {});
   }, [todoList]);
   var mySerialsValue = useCreation(function () {
     return reduce(resources, function (ret, resKey) {
-      var _actionMap$resKey;
-      ret |= ((_actionMap$resKey = actionMap[resKey]) === null || _actionMap$resKey === void 0 ? void 0 : _actionMap$resKey.serialValue) || 0;
+      ret |= actionMap[resKey] || 0;
       return ret;
     }, 0);
   }, [resources, actionMap]);
   var _useCreation = useCreation(function () {
-      var approvedActions = reduce(actionMap, function (ret, action) {
-        if (mySerialsValue & action.serialValue) {
+      var approvedActions = reduce(todoList, function (ret, action) {
+        if (isNil(action.serial) || mySerialsValue & actionMap[action.serial]) {
           ret.push(action);
         } else if (action.serialEffect === 'disable') {
           ret.push(action);
@@ -89,7 +87,7 @@ var LDActions = function LDActions(_ref2) {
       var _length = approvedActions.length;
       var _permanent = approvedActions.splice(0, max >= _length ? _length : max - 1);
       return [_permanent, approvedActions];
-    }, [max, mySerialsValue, actionMap]),
+    }, [max, mySerialsValue, actionMap, todoList]),
     _useCreation2 = _slicedToArray(_useCreation, 2),
     permanent = _useCreation2[0],
     more = _useCreation2[1];

package/es/components/LDActions/index.less

@@ -1,12 +1,15 @@
 @spanDefault: #262626;
-@spanPrimary: var(--luck-color-primary);
+@spanPrimary: var(--ant-primary-color);
 @spanDanger: #ff4d4f;
 @spanDestroy: #820014;
 
 .ldActions {
 
   button:not(:last-child) {
-    margin-right: 2px;
+    margin-right: 4px;
+  }
+  button:not(:first-child) {
+    margin-left: 4px;
   }
   span {
     cursor: pointer;
@@ -20,8 +23,8 @@
   }
 
   button.primary {
-    background-color: var(--luck-color-primary);
-    border-color: var(--luck-color-primary);
+    background-color: var(--ant-primary-color);
+    border-color: var(--ant-primary-color);
     color: white;
   }
   span.primary {

package/es/components/LdAutoForm/index.js

@@ -2,9 +2,9 @@ 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", "relationKey", "fields"];
+var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey", "fields", "setVerifyRules"];
 import React, { createRef, useContext } from 'react';
-import { reduce, keyBy, isEmpty, pick } from 'lodash';
+import { reduce, keyBy, isEmpty, pick, union, omit } from 'lodash';
 import { BasicDivider } from 'luck-design';
 import { AutoForm } from '@luck-design-biz/base/FormList';
 import ldBuilder from "../../helper/ldBuilder";
@@ -43,6 +43,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     _ref$relationKey = _ref.relationKey,
     relationKey = _ref$relationKey === void 0 ? window.appConfig.constraintKeys.PRIMARY : _ref$relationKey,
     fields = _ref.fields,
+    setVerifyRules = _ref.setVerifyRules,
     props = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = useContext(LuckDaContext) || {},
     setFieldProps = _ref2.setFieldProps;
@@ -51,33 +52,35 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var basicItems = function () {
     var fieldsObj = keyBy(fields, 'field');
     var columnsObj = keyBy(columns, 'field');
-    var keys = isEmpty(fields) ? Object.keys(columnsObj) : Object.keys(fieldsObj);
+    var keys = isEmpty(fields) ? Object.keys(columnsObj) : union(Object.keys(fieldsObj), Object.keys(columnsObj));
     var _defaultValues = {};
     var _nodes = reduce(keys, function (result, key) {
       var setting = fieldsObj[key];
       var col = columnsObj[key];
       if ((setting === null || setting === void 0 ? void 0 : setting._type) === 'divider') {
         result.push( /*#__PURE__*/React.createElement(BasicDivider, {
-          title: setting === null || setting === void 0 ? void 0 : setting.fieldAliasName
+          title: setting === null || setting === void 0 ? void 0 : setting.aliasName
         }));
-      } else if (col.isShowInForm) {
+      } else if (col !== null && col !== void 0 && col.isShowInForm) {
         var customFiled = filedsRewrite.find(function (_field) {
           return _field.name === col.aliaName;
         }) || {};
         _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, _defineProperty(_defineProperty({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
+        var defaultSet = ['col', 'row', 'note', 'tip', 'placeholder'];
         var newCol = _objectSpread(_objectSpread({}, col), {}, {
-          fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || col.fieldName
-        }, pick(setting, ['col', 'row', 'note', 'tip', 'placeholder']));
+          setVerifyRules: setVerifyRules,
+          fieldName: (setting === null || setting === void 0 ? void 0 : setting.aliasName) || col.fieldName
+        }, pick(setting, defaultSet));
         result.push(getFormItem(newCol, _objectSpread(_objectSpread({
           formId: ldId,
           moduleCode: moduleCode
         }, customFiled), {}, {
           handleValueChange: function handleValueChange(value) {
             return onValueChange(_defineProperty({}, ldId, _defineProperty({}, col.aliaName, value)));
-          }
+          },
+          setting: omit(setting, [].concat(defaultSet, ['uid', 'field']))
         })));
       }
-      ;
       return result;
     }, []);
     defaultValues.current = _defaultValues;
@@ -91,7 +94,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var formConfig = {
     formId: ldId,
     isMain: isMain,
-    defaultDataSource: _objectSpread(_objectSpread({}, formItemDataFormat(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current))
+    defaultDataSource: _objectSpread(_objectSpread({}, formItemDataFormat(columns.map(function (c) {
+      return _objectSpread(_objectSpread({}, c), keyBy(fields, 'field')[c.field]);
+    }), defaultValues.current)), defaultDataSourceFormat(defaultValues.current))
   };
   var onOperate = function onOperate() {
     var _onOperate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -135,7 +140,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
       }
     }, onQuery), {}, {
       format: function format(data, res) {
-        var formItemData = _objectSpread({}, formItemDataFormat(columns, data));
+        var formItemData = _objectSpread({}, formItemDataFormat(columns.map(function (c) {
+          return _objectSpread(_objectSpread({}, c), keyBy(fields, 'field')[c.field]);
+        }), data));
         if (onQuery !== null && onQuery !== void 0 && onQuery.format) return onQuery.format(data, formItemData, res); // 以预设为主
         return formItemData;
       }

package/es/components/LdFormList/index.js

@@ -6,11 +6,11 @@ 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 = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps"],
+var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps", "setVerifyRules"],
   _excluded2 = ["dataSets", "doAction", "resources"],
   _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft", "serial"],
   _excluded4 = ["ldId", "initData", "overModel"];
-import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState } from 'react';
+import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState, useEffect } from 'react';
 import { connect, getDvaApp, useRouteMatch } from 'umi';
 import PropTypes from 'prop-types';
 import { isArray, sortBy, mapValues, reduce, includes } from 'lodash';
@@ -55,8 +55,10 @@ var LdFormList = function LdFormList(_ref) {
     } : _ref$renderFormExtra,
     _ref$bpmButtonProps = _ref.bpmButtonProps,
     bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
+    setVerifyRules = _ref.setVerifyRules,
     props = _objectWithoutProperties(_ref, _excluded);
   var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
+  var currentValueRef = useRef(null);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     submitLoading = _useState2[0],
@@ -86,6 +88,9 @@ var LdFormList = function LdFormList(_ref) {
   var formListRef = useRef(null);
   useImperativeHandle(wrapperRef, function () {
     return _objectSpread(_objectSpread({}, formListRef.current), {}, {
+      getCValue: function getCValue() {
+        return currentValueRef.current || props.formData;
+      },
       onLdQuery: function onLdQuery() {
         var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         if (props.formMode !== 'add') {
@@ -98,7 +103,8 @@ var LdFormList = function LdFormList(_ref) {
           });
           formListRef.current.doQuery();
         }
-      }
+      },
+      ticketData: props.ticketData
     });
   });
   var handleValueChange = useMemoizedFn(function (change) {
@@ -109,6 +115,7 @@ var LdFormList = function LdFormList(_ref) {
       var getValue = ((_formRefs$key = formRefs[key]) !== null && _formRefs$key !== void 0 && (_formRefs$key = _formRefs$key.formRef) !== null && _formRefs$key !== void 0 && _formRefs$key.current ? formRefs[key].getData : null) || ((_formRefs$key$current = formRefs[key].current) === null || _formRefs$key$current === void 0 ? void 0 : _formRefs$key$current.getFieldsValue);
       return _defineProperty({}, key, getValue && getValue());
     });
+    currentValueRef.current = data;
     onValueChange(change, data);
   });
   var renderExtra = useMemoizedFn(function (formId, extraConfig, type) {
@@ -302,7 +309,8 @@ var LdFormList = function LdFormList(_ref) {
         ticketData: props.ticketData,
         renderTopLeft: function renderTopLeft() {
           return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
-        }
+        },
+        setVerifyRules: setVerifyRules
       })));
       return /*#__PURE__*/React.createElement(Fragment, {
         key: ldId
@@ -322,7 +330,8 @@ var LdFormList = function LdFormList(_ref) {
         ticketData: props.ticketData,
         renderTopLeft: function renderTopLeft() {
           return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'), _renderTopLeft()];
-        }
+        },
+        setVerifyRules: setVerifyRules
       })));
     }
     return ChildrenUtil.deepMap(formProps, function (child) {

package/es/components/LdGrid/index.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "wrapperRef", "list", "detail", "params", "filters", "_loading", "loading", "unclosableSet", "onQuery", "doQuery", "pagination", "pageno", "pagesize", "totalCount", "columnsRewrite", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid", "writable"],
+var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "wrapperRef", "list", "detail", "params", "filters", "_loading", "loading", "unclosableSet", "onQuery", "doQuery", "pagination", "pageno", "pagesize", "totalCount", "columnsRewrite", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid", "writable", "autoRowClick"],
   _excluded2 = ["ldId", "moduleCode", "suppressInit", "overModel", "afterQuery", "isTreeGrid"];
 import React, { forwardRef, useImperativeHandle, useRef, useEffect } from 'react';
 import { getDvaApp } from 'umi';
@@ -45,6 +45,8 @@ var LdGrid = function LdGrid(_ref) {
     isFlow = _ref.isFlow,
     isTreeGrid = _ref.isTreeGrid,
     writable = _ref.writable,
+    _ref$autoRowClick = _ref.autoRowClick,
+    autoRowClick = _ref$autoRowClick === void 0 ? false : _ref$autoRowClick,
     props = _objectWithoutProperties(_ref, _excluded);
   var gridRef = useRef(null);
   var treeConfig = useCreation(function () {
@@ -65,8 +67,19 @@ var LdGrid = function LdGrid(_ref) {
   useEffect(function () {
     readFilter && readFilter(params, filters);
   }, [params, filters]);
+  useEffect(function () {
+    if (autoRowClick) {
+      if (list[0]) props.onRowClick && props.onRowClick(detail[list[0]], 0);else props.onRowClick && props.onRowClick(null);
+    }
+  }, [list[0]]);
   useImperativeHandle(wrapperRef, function () {
     return _objectSpread(_objectSpread({}, gridRef.current), {}, {
+      getProps: function getProps() {
+        var _getDvaApp;
+        return {
+          apiUrl: (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 || (_getDvaApp = _getDvaApp._store.getState()[namespace]) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp.apiUrl
+        };
+      },
       onLdQuery: function onLdQuery() {
         var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         doQuery({
@@ -174,11 +187,11 @@ var LdIndex = function LdIndex(_ref2) {
     props = _objectWithoutProperties(_ref2, _excluded2);
   var isTreeGrid = isNil(_isTreeGrid) ? includes(props.isTree, props.dataSetKey) : _isTreeGrid;
   var Component = useCreation(function () {
-    var _getDvaApp, _getDvaApp2;
-    (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 || _getDvaApp.unmodel(namespace);
-    if (!((_getDvaApp2 = getDvaApp()) !== null && _getDvaApp2 !== void 0 && _getDvaApp2._store.getState()[namespace])) {
-      var _getDvaApp3;
-      (_getDvaApp3 = getDvaApp()) === null || _getDvaApp3 === void 0 || _getDvaApp3.model(createModel(namespace, _objectSpread(_objectSpread({
+    var _getDvaApp2, _getDvaApp3;
+    (_getDvaApp2 = getDvaApp()) === null || _getDvaApp2 === void 0 || _getDvaApp2.unmodel(namespace);
+    if (!((_getDvaApp3 = getDvaApp()) !== null && _getDvaApp3 !== void 0 && _getDvaApp3._store.getState()[namespace])) {
+      var _getDvaApp4;
+      (_getDvaApp4 = getDvaApp()) === null || _getDvaApp4 === void 0 || _getDvaApp4.model(createModel(namespace, _objectSpread(_objectSpread({
         behaviorKey: isTreeGrid ? 'readTree' : 'readGrid'
       }, overModel), {}, {
         isFlow: isTreeGrid || !!props.isFlow,

package/es/components/LdGridForm/index.js

@@ -2,9 +2,9 @@ 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", "columnsRewrite", "columnsReset", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode", "fields"];
+var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "columnsReset", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode", "fields", "setVerifyRules"];
 import React, { createRef, useContext } from 'react';
-import { reduce, keyBy, isEmpty, pick } from 'lodash';
+import { reduce, keyBy, isEmpty, pick, omit } from 'lodash';
 import classNames from 'classnames';
 import ldBuilder from "../../helper/ldBuilder";
 import { GridForm } from '@luck-design-biz/base/FormList';
@@ -52,6 +52,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     formRef = _ref.formRef,
     formMode = _ref.formMode,
     fields = _ref.fields,
+    setVerifyRules = _ref.setVerifyRules,
     props = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = useContext(LuckDaContext) || {},
     setFieldProps = _ref2.setFieldProps;
@@ -71,7 +72,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     var _nodes = reduce(keys, function (result, key) {
       var setting = fieldsObj[key];
       var col = columnsObj[key];
-      if (col.isShowInForm) {
+      if (col !== null && col !== void 0 && col.isShowInForm) {
         var _customColumn;
         var customColumn = columnsRewrite.find(function (column) {
           return column.field === col.aliaName;
@@ -82,13 +83,16 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
         });
         _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, _defineProperty(_defineProperty({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
         var newCol = _objectSpread(_objectSpread({}, col), {}, {
-          fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || col.fieldName
+          setVerifyRules: setVerifyRules,
+          fieldName: (setting === null || setting === void 0 ? void 0 : setting.aliasName) || col.fieldName
         });
-        result.push(getFormColumn(type, newCol, _objectSpread(_objectSpread(_objectSpread({}, pick(setting, ['width', 'align', 'headerAlign', 'pinned', 'tip'])), customColumn), {}, {
+        var defaultSet = ['width', 'align', 'headerAlign', 'pinned', 'tip'];
+        result.push(getFormColumn(type, newCol, _objectSpread(_objectSpread(_objectSpread({}, pick(setting, defaultSet)), customColumn), {}, {
           formItemRewrite: _objectSpread(_objectSpread({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
             moduleCode: moduleCode,
             formRef: formRef,
-            formMode: formMode
+            formMode: formMode,
+            setting: omit(setting, [].concat(defaultSet, ['uid', 'field']))
           })
         })));
       }
@@ -106,7 +110,9 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     })));
     return columnsReset ? columnsReset(_nodes) : _nodes;
   }();
-  var defaultDataSource = _objectSpread(_objectSpread({}, formItemDataFormat(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
+  var defaultDataSource = _objectSpread(_objectSpread({}, formItemDataFormat(columns.map(function (c) {
+    return _objectSpread(_objectSpread({}, c), keyBy(fields, 'field')[c.field]);
+  }), defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
   var formConfig = {
     formId: ldId,
     columns: _columns,
@@ -146,7 +152,10 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     orderByAdd: "asc",
     rowSelection: true,
     type: type,
-    rowKey: window.appConfig.constraintKeys.PRIMARY || 'indocno'
+    rowKey: window.appConfig.constraintKeys.PRIMARY || 'indocno',
+    wrapperProps: {
+      id: ldId
+    }
   }, props, {
     onQuery: _objectSpread(_objectSpread({
       api: behaviorCall,
@@ -163,7 +172,9 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     }, onQuery), {}, {
       format: function format(data) {
         var formItemData = data.map(function (item) {
-          return formItemDataFormat(gridColumns, item);
+          return formItemDataFormat(gridColumns.map(function (c) {
+            return _objectSpread(_objectSpread({}, c), keyBy(fields, 'field')[c.field]);
+          }), item);
         });
         if (onQuery !== null && onQuery !== void 0 && onQuery.format) return onQuery.format(data, formItemData); // 以预设为主
         return formItemData;

package/es/components/LdTree/index.js

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
@@ -76,6 +77,7 @@ var LdTree = function LdTree(_ref) {
     defaultExpandedProps = _useState4[0],
     setDefaultExpandedProps = _useState4[1];
   var treeRef = useRef(null);
+  var onceRef = useRef(true);
   var defaultParams = useCreation(function () {
     var _params = [_objectSpread({
       moduleCode: moduleCode,
@@ -113,7 +115,8 @@ var LdTree = function LdTree(_ref) {
           }
           var treeData = dataToTreeFormat ? dataToTreeFormat(data) : dataToTree(data, null, window.appConfig.constraintKeys.PRIMARY, window.appConfig.constraintKeys.PARENT);
           setDataSource(treeData);
-          afterInit && afterInit(treeData);
+          onceRef.current && afterInit && afterInit(treeData, data);
+          onceRef.current = false;
         }
       }
     }),
@@ -219,7 +222,22 @@ var LdTree = function LdTree(_ref) {
   });
   var handleDrop = useMemoizedFn(function (info) {
     var dragInfo = dragTreeData(info, dataSource);
-    onDrop && onDrop(info, dragInfo);
+    if (onDrop) onDrop(info, dragInfo);else if (dragInfo !== false) {
+      doAction('drag', {
+        get: {
+          datasetCode: dataSetKey
+        },
+        post: {
+          fromId: info.dragNode.props.dataRef[PRIMARY],
+          toId: info.node.props.dataRef[PRIMARY]
+        }
+      }, {
+        showConfirm: false,
+        callback: function callback(success) {
+          return success && onLdQuery();
+        }
+      });
+    }
   });
   var onAdd = useCreation(function () {
     return !(readOnly || !rootAdd || rootAdd.resource && !includes(resources, rootAdd.resource) || onlyRoot && (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) > 0) ? function () {
@@ -234,18 +252,17 @@ var LdTree = function LdTree(_ref) {
         return;
       }
       (service || behaviorCall)(_objectSpread(_objectSpread({}, params[0]), {}, _defineProperty({}, parentKey, treeNode.props.dataRef[window.appConfig.constraintKeys.PRIMARY]))).then(function (res) {
-        console.log(res);
+        var code = res.code,
+          list = res.list,
+          detail = res.detail;
+        if (code === 1) {
+          treeNode.props.dataRef.children = list.map(function (i) {
+            return detail[i];
+          });
+          setDataSource(_toConsumableArray(dataSource));
+          resolve();
+        }
       });
-      // setTimeout(() => {
-      //   treeNode.props.dataRef.children = [
-      //     { title: 'Child Node', key: `${treeNode.props.eventKey}-0` },
-      //     { title: 'Child Node', key: `${treeNode.props.eventKey}-1` },
-      //   ];
-      //   this.setState({
-      //     treeData: [...this.state.treeData],
-      //   });
-      //   resolve();
-      // }, 1000);
     });
   });
   var asyncLoadData = useCreation(function () {