@luck-design-biz/luckda 0.0.19-UI-1 → 0.0.20-UI-1

package/es/components/LdFormList/index.js

@@ -8,10 +8,8 @@ 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"],
   _excluded2 = ["dataSets", "doAction", "resources"],
-  _excluded3 = ["formMode"],
-  _excluded4 = ["formMode"],
-  _excluded5 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
-  _excluded6 = ["ldId", "initData", "overModel"];
+  _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
+  _excluded4 = ["ldId", "initData", "overModel"];
 import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState } from 'react';
 import { connect, getDvaApp, useRouteMatch, useModel } from 'umi';
 import PropTypes from 'prop-types';
@@ -59,14 +57,6 @@ var LdFormList = function LdFormList(_ref) {
     _ref$bpmButtonProps = _ref.bpmButtonProps,
     bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
     props = _objectWithoutProperties(_ref, _excluded);
-  var _useModel = useModel('@@qiankunStateFromMaster', function (qiankunStateFromMaster) {
-      return {
-        peek: qiankunStateFromMaster === null || qiankunStateFromMaster === void 0 ? void 0 : qiankunStateFromMaster.peekFloatLayer,
-        refresh: qiankunStateFromMaster === null || qiankunStateFromMaster === void 0 ? void 0 : qiankunStateFromMaster.refreshFloatLayer
-      };
-    }),
-    peek = _useModel.peek,
-    refresh = _useModel.refresh;
   var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -210,41 +200,11 @@ var LdFormList = function LdFormList(_ref) {
       if (success) {
         if (afterSubmit) {
           afterSubmit(success, mainKey, res);
-          // 刷新浮层，解决新增后，操作日志获取不到uid的问题
-          if (refresh && peek) {
-            var _peek = peek(),
-              href = _peek.href;
-            var _href$split = href.split('?'),
-              _href$split2 = _slicedToArray(_href$split, 2),
-              path = _href$split2[0],
-              argsStr = _href$split2[1];
-            var _parse = parse(argsStr),
-              _formMode = _parse.formMode,
-              _props2 = _objectWithoutProperties(_parse, _excluded3);
-            refresh({
-              href: "".concat(path, "?").concat(PRIMARY, "=").concat(mainFormData[PRIMARY], "&").concat(stringify(_objectSpread({}, _props2)))
-            });
-          }
         } else {
           var _formListRef$current;
           props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
           formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, mainFormData), function () {
             formListRef.current.setFormMode('info');
-            // 刷新浮层，解决新增后，操作日志获取不到uid的问题
-            if (refresh && peek) {
-              var _peek2 = peek(),
-                _href = _peek2.href;
-              var _href$split3 = _href.split('?'),
-                _href$split4 = _slicedToArray(_href$split3, 2),
-                _path = _href$split4[0],
-                _argsStr = _href$split4[1];
-              var _parse2 = parse(_argsStr),
-                _formMode2 = _parse2.formMode,
-                _props3 = _objectWithoutProperties(_parse2, _excluded4);
-              refresh({
-                href: "".concat(_path, "?formMode=info&").concat(PRIMARY, "=").concat(mainFormData[PRIMARY], "&").concat(stringify(_objectSpread({}, _props3)))
-              });
-            }
           });
         }
       }
@@ -311,13 +271,13 @@ var LdFormList = function LdFormList(_ref) {
         _renderTopLeft = _ref8$renderTopLeft === void 0 ? function () {
           return /*#__PURE__*/React.createElement(React.Fragment, null);
         } : _ref8$renderTopLeft,
-        _props = _objectWithoutProperties(_ref8, _excluded5);
+        _props = _objectWithoutProperties(_ref8, _excluded3);
       var _props$type = _props.type,
         type = _props$type === void 0 ? 'auto' : _props$type;
       var renderForm = type === 'auto' ? buildLdAutoForm : buildLdGridForm;
       if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/React.createElement(Collapse, {
         title: title || ldId,
-        extra: type === 'auto' && renderExtra(ldId, extraConfig, 'graphic'),
+        extra: type === 'auto' && renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'),
         id: ldId,
         key: ldId,
         mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
@@ -341,7 +301,7 @@ var LdFormList = function LdFormList(_ref) {
         style: {
           textAlign: 'right'
         }
-      }, renderExtra(ldId, extraConfig, 'graphic')), renderForm(_objectSpread(_objectSpread({}, _props), {}, {
+      }, renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic')), renderForm(_objectSpread(_objectSpread({}, _props), {}, {
         ldId: ldId,
         mainFormLdId: mainFormLdId,
         mainDataSetKey: mainDataSetKey,
@@ -349,7 +309,7 @@ var LdFormList = function LdFormList(_ref) {
         onValueChange: handleValueChange,
         ticketData: props.ticketData,
         renderTopLeft: function renderTopLeft() {
-          return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'graphic'), _renderTopLeft()];
+          return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'), _renderTopLeft()];
         }
       })));
     }
@@ -388,7 +348,7 @@ var Index = function Index(_ref10) {
   var namespace = _ref10.ldId,
     initData = _ref10.initData,
     overModel = _ref10.overModel,
-    props = _objectWithoutProperties(_ref10, _excluded6);
+    props = _objectWithoutProperties(_ref10, _excluded4);
   var match = useRouteMatch();
   var Component = useCreation(function () {
     var _getDvaApp3, _getDvaApp4, _match$params;

package/es/components/LdGrid/index.js

@@ -126,6 +126,9 @@ var LdGrid = function LdGrid(_ref) {
     unclosableSet: unclosableSet,
     onQuery: onQuery
   });
+
+  // console.log('_columns',columns,_columns)
+
   return /*#__PURE__*/React.createElement(GridList, _extends({
     columns: _columns
     // 资源串、行为配置

package/es/components/LdTree/index.js

@@ -142,7 +142,8 @@ var LdTree = function LdTree(_ref) {
   var renderTitleNode = function renderTitleNode(data, unSelectable) {
     var nodeTitle = isFunction(treeNodeTitle) ? treeNodeTitle(data) : data[treeNodeTitle];
     return /*#__PURE__*/React.createElement("div", {
-      className: styles.nodeTitle
+      className: styles.nodeTitle,
+      key: data[rowKey]
     }, /*#__PURE__*/React.createElement("div", {
       title: nodeTitle,
       className: classNames(_defineProperty({}, styles.nodeTitleDisabled, unSelectable))

package/es/utils/grid.js

@@ -93,6 +93,20 @@ export function getColumnRender(name, type) {
   }
   return render;
 }
+
+// 获取表头、单元格对应的对齐方式
+var getAlign = function getAlign(extraData, alignClass) {
+  switch (extraData[alignClass]) {
+    case '居左':
+      return 'left';
+    case '居中':
+      return 'center';
+    case '居右':
+      return 'right';
+    default:
+      return 'left';
+  }
+};
 export var getGridColumn = function getGridColumn() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     comName = _ref.comName,
@@ -102,7 +116,9 @@ export var getGridColumn = function getGridColumn() {
   var isTreeGrid = arguments.length > 2 ? arguments[2] : undefined;
   var writable = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   var _props$isVirtual = props.isVirtual,
-    isVirtual = _props$isVirtual === void 0 ? false : _props$isVirtual;
+    isVirtual = _props$isVirtual === void 0 ? false : _props$isVirtual,
+    _props$extra = props.extra,
+    extra = _props$extra === void 0 ? {} : _props$extra;
   var _translator = translator(props),
     name = _translator.name,
     translateProps = _objectWithoutProperties(_translator, _excluded2);
@@ -110,9 +126,12 @@ export var getGridColumn = function getGridColumn() {
     filter = _merge.filter,
     filterParams = _merge.filterParams,
     _props = _objectWithoutProperties(_merge, _excluded3);
+  var _extra = JSON.parse(extra);
   var data = _objectSpread(_objectSpread({}, _props), {}, {
     field: name,
     title: _props.label,
+    headerAlign: getAlign(_extra, 'sheading_alignment_virtual'),
+    align: getAlign(_extra, 'scell_alignment_virtual'),
     render: _props.render || getColumnRender(name, comName || defaultComName[property], _props)
   });
   if (isTreeGrid || isVirtual || includes(['user', 'select', 'group', 'switch', 'color', 'region', 'file'], comName || defaultComName[property])) data.sortable = false;
@@ -276,7 +295,6 @@ export var getGridColumn = function getGridColumn() {
           }
           break;
       }
-      ;
       data.cellWriter = getFormItemUtils(_objectSpread(_objectSpread({}, _props), formItemProps));
     }
   }

package/lib/components/LdFormList/index.js

@@ -34,10 +34,8 @@ var _services = require("../../services");
 var _querystring = require("querystring");
 var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps"],
   _excluded2 = ["dataSets", "doAction", "resources"],
-  _excluded3 = ["formMode"],
-  _excluded4 = ["formMode"],
-  _excluded5 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
-  _excluded6 = ["ldId", "initData", "overModel"];
+  _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
+  _excluded4 = ["ldId", "initData", "overModel"];
 // 组件
 var LdFormList = function LdFormList(_ref) {
   var _formList$find;
@@ -66,14 +64,6 @@ var LdFormList = function LdFormList(_ref) {
     _ref$bpmButtonProps = _ref.bpmButtonProps,
     bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var _useModel = (0, _umi.useModel)('@@qiankunStateFromMaster', function (qiankunStateFromMaster) {
-      return {
-        peek: qiankunStateFromMaster === null || qiankunStateFromMaster === void 0 ? void 0 : qiankunStateFromMaster.peekFloatLayer,
-        refresh: qiankunStateFromMaster === null || qiankunStateFromMaster === void 0 ? void 0 : qiankunStateFromMaster.refreshFloatLayer
-      };
-    }),
-    peek = _useModel.peek,
-    refresh = _useModel.refresh;
   var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -217,41 +207,11 @@ var LdFormList = function LdFormList(_ref) {
       if (success) {
         if (afterSubmit) {
           afterSubmit(success, mainKey, res);
-          // 刷新浮层，解决新增后，操作日志获取不到uid的问题
-          if (refresh && peek) {
-            var _peek = peek(),
-              href = _peek.href;
-            var _href$split = href.split('?'),
-              _href$split2 = (0, _slicedToArray2.default)(_href$split, 2),
-              path = _href$split2[0],
-              argsStr = _href$split2[1];
-            var _parse = (0, _querystring.parse)(argsStr),
-              _formMode = _parse.formMode,
-              _props2 = (0, _objectWithoutProperties2.default)(_parse, _excluded3);
-            refresh({
-              href: "".concat(path, "?").concat(PRIMARY, "=").concat(mainFormData[PRIMARY], "&").concat((0, _querystring.stringify)((0, _objectSpread2.default)({}, _props2)))
-            });
-          }
         } else {
           var _formListRef$current;
           props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
           formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, mainFormData), function () {
             formListRef.current.setFormMode('info');
-            // 刷新浮层，解决新增后，操作日志获取不到uid的问题
-            if (refresh && peek) {
-              var _peek2 = peek(),
-                _href = _peek2.href;
-              var _href$split3 = _href.split('?'),
-                _href$split4 = (0, _slicedToArray2.default)(_href$split3, 2),
-                _path = _href$split4[0],
-                _argsStr = _href$split4[1];
-              var _parse2 = (0, _querystring.parse)(_argsStr),
-                _formMode2 = _parse2.formMode,
-                _props3 = (0, _objectWithoutProperties2.default)(_parse2, _excluded4);
-              refresh({
-                href: "".concat(_path, "?formMode=info&").concat(PRIMARY, "=").concat(mainFormData[PRIMARY], "&").concat((0, _querystring.stringify)((0, _objectSpread2.default)({}, _props3)))
-              });
-            }
           });
         }
       }
@@ -318,13 +278,13 @@ var LdFormList = function LdFormList(_ref) {
         _renderTopLeft = _ref8$renderTopLeft === void 0 ? function () {
           return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
         } : _ref8$renderTopLeft,
-        _props = (0, _objectWithoutProperties2.default)(_ref8, _excluded5);
+        _props = (0, _objectWithoutProperties2.default)(_ref8, _excluded3);
       var _props$type = _props.type,
         type = _props$type === void 0 ? 'auto' : _props$type;
       var renderForm = type === 'auto' ? _LdAutoForm.default : _LdGridForm.default;
       if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/_react.default.createElement(_base.Collapse, {
         title: title || ldId,
-        extra: type === 'auto' && renderExtra(ldId, extraConfig, 'graphic'),
+        extra: type === 'auto' && renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'),
         id: ldId,
         key: ldId,
         mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
@@ -348,7 +308,7 @@ var LdFormList = function LdFormList(_ref) {
         style: {
           textAlign: 'right'
         }
-      }, renderExtra(ldId, extraConfig, 'graphic')), renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
+      }, renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic')), renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
         ldId: ldId,
         mainFormLdId: mainFormLdId,
         mainDataSetKey: mainDataSetKey,
@@ -356,7 +316,7 @@ var LdFormList = function LdFormList(_ref) {
         onValueChange: handleValueChange,
         ticketData: props.ticketData,
         renderTopLeft: function renderTopLeft() {
-          return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'graphic'), _renderTopLeft()];
+          return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'), _renderTopLeft()];
         }
       })));
     }
@@ -395,7 +355,7 @@ var Index = function Index(_ref10) {
   var namespace = _ref10.ldId,
     initData = _ref10.initData,
     overModel = _ref10.overModel,
-    props = (0, _objectWithoutProperties2.default)(_ref10, _excluded6);
+    props = (0, _objectWithoutProperties2.default)(_ref10, _excluded4);
   var match = (0, _umi.useRouteMatch)();
   var Component = (0, _ahooks.useCreation)(function () {
     var _getDvaApp3, _getDvaApp4, _match$params;

package/lib/components/LdGrid/index.js

@@ -134,6 +134,9 @@ var LdGrid = function LdGrid(_ref) {
     unclosableSet: unclosableSet,
     onQuery: onQuery
   });
+
+  // console.log('_columns',columns,_columns)
+
   return /*#__PURE__*/_react.default.createElement(_List.GridList, (0, _extends2.default)({
     columns: _columns
     // 资源串、行为配置

package/lib/components/LdTree/index.js

@@ -150,7 +150,8 @@ var LdTree = function LdTree(_ref) {
   var renderTitleNode = function renderTitleNode(data, unSelectable) {
     var nodeTitle = (0, _lodash.isFunction)(treeNodeTitle) ? treeNodeTitle(data) : data[treeNodeTitle];
     return /*#__PURE__*/_react.default.createElement("div", {
-      className: _index.default.nodeTitle
+      className: _index.default.nodeTitle,
+      key: data[rowKey]
     }, /*#__PURE__*/_react.default.createElement("div", {
       title: nodeTitle,
       className: (0, _classnames.default)((0, _defineProperty2.default)({}, _index.default.nodeTitleDisabled, unSelectable))

package/lib/utils/grid.js

@@ -101,6 +101,20 @@ function getColumnRender(name, type) {
   }
   return render;
 }
+
+// 获取表头、单元格对应的对齐方式
+var getAlign = function getAlign(extraData, alignClass) {
+  switch (extraData[alignClass]) {
+    case '居左':
+      return 'left';
+    case '居中':
+      return 'center';
+    case '居右':
+      return 'right';
+    default:
+      return 'left';
+  }
+};
 var getGridColumn = function getGridColumn() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     comName = _ref.comName,
@@ -110,7 +124,9 @@ var getGridColumn = function getGridColumn() {
   var isTreeGrid = arguments.length > 2 ? arguments[2] : undefined;
   var writable = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   var _props$isVirtual = props.isVirtual,
-    isVirtual = _props$isVirtual === void 0 ? false : _props$isVirtual;
+    isVirtual = _props$isVirtual === void 0 ? false : _props$isVirtual,
+    _props$extra = props.extra,
+    extra = _props$extra === void 0 ? {} : _props$extra;
   var _translator = (0, _form.translator)(props),
     name = _translator.name,
     translateProps = (0, _objectWithoutProperties2.default)(_translator, _excluded2);
@@ -118,9 +134,12 @@ var getGridColumn = function getGridColumn() {
     filter = _merge.filter,
     filterParams = _merge.filterParams,
     _props = (0, _objectWithoutProperties2.default)(_merge, _excluded3);
+  var _extra = JSON.parse(extra);
   var data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
     field: name,
     title: _props.label,
+    headerAlign: getAlign(_extra, 'sheading_alignment_virtual'),
+    align: getAlign(_extra, 'scell_alignment_virtual'),
     render: _props.render || getColumnRender(name, comName || _form.defaultComName[property], _props)
   });
   if (isTreeGrid || isVirtual || (0, _lodash.includes)(['user', 'select', 'group', 'switch', 'color', 'region', 'file'], comName || _form.defaultComName[property])) data.sortable = false;
@@ -284,7 +303,6 @@ var getGridColumn = function getGridColumn() {
           }
           break;
       }
-      ;
       data.cellWriter = getFormItemUtils((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), formItemProps));
     }
   }

package/package.json

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