@luck-design-biz/luckda 0.0.25-8 → 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/LdAutoForm/index.js

@@ -4,7 +4,7 @@ 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", "setVerifyRules"];
 import React, { createRef, useContext } from 'react';
-import { reduce, keyBy, isEmpty, pick, union } 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";
@@ -66,20 +66,21 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
           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), {}, {
           setVerifyRules: setVerifyRules,
           fieldName: (setting === null || setting === void 0 ? void 0 : setting.aliasName) || col.fieldName
-        }, pick(setting, ['col', 'row', 'note', 'tip', 'placeholder']));
+        }, 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;
@@ -93,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] : {};
@@ -137,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

@@ -103,7 +103,8 @@ var LdFormList = function LdFormList(_ref) {
           });
           formListRef.current.doQuery();
         }
-      }
+      },
+      ticketData: props.ticketData
     });
   });
   var handleValueChange = useMemoizedFn(function (change) {

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,6 +67,11 @@ 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() {

package/es/components/LdGridForm/index.js

@@ -4,7 +4,7 @@ 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", "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';
@@ -72,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;
@@ -86,11 +86,13 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
           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']))
           })
         })));
       }
@@ -108,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,
@@ -148,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,
@@ -165,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;