@luck-design-biz/luckda 0.0.24-2 → 0.0.25-2

package/es/components/Builder/index.js

@@ -2,14 +2,17 @@ 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 React, { forwardRef, createContext, useState, useRef } from 'react';
+import React, { forwardRef, createContext, useState, useRef, useContext } from 'react';
 import { useRequest, useSetState, useMemoizedFn } from 'ahooks';
 import { BasicForm, BasicFormItem } from 'luck-design';
 import LdPop from "../LdPop";
 import { readModlue } from "../../services";
 import { doAction as doActionUtils } from "../../helper/action";
 import { formatMessage } from '@luck-design-biz/base/utils';
-var LuckDaContext = /*#__PURE__*/createContext();
+export var LuckDaContext = /*#__PURE__*/createContext();
+export var useLDCtx = function useLDCtx() {
+  return useContext(LuckDaContext);
+};
 var builder = function builder(WrappedComponent, moduleCode) {
   var Component = /*#__PURE__*/forwardRef(function (props, ref) {
     if (!moduleCode) return formatMessage({
@@ -131,5 +134,4 @@ var builder = function builder(WrappedComponent, moduleCode) {
   });
   return Component;
 };
-export default builder;
-export { LuckDaContext };
+export default builder;

package/es/components/IconFont/index.js

@@ -0,0 +1,5 @@
+import { Icon } from 'luck-design/antd';
+import { ICONLIST_JS } from "../../lowcode/constants/api-url";
+export default Icon.createFromIconfontCN({
+  scriptUrl: ICONLIST_JS
+});

package/es/components/LDActions/index.js

@@ -0,0 +1,133 @@
+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";
+var _excluded = ["children", "display", "action", "className", "onClick"],
+  _excluded2 = ["max", "display", "todoList", "className", "moreText", "doAction"];
+import React, { Fragment } from 'react';
+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 { getResources } from "../../helper/ldComBuild";
+import styles from "./index.less";
+var DisplayComp = function DisplayComp(_ref) {
+  var children = _ref.children,
+    display = _ref.display,
+    action = _ref.action,
+    className = _ref.className,
+    onClick = _ref.onClick,
+    props = _objectWithoutProperties(_ref, _excluded);
+  if (display === 'text') {
+    return /*#__PURE__*/React.createElement("span", _extends({}, props, {
+      className: classNames(styles[action.riskLevel], _defineProperty(_defineProperty({}, className, !!className), styles.disabled, action.serialEffect === 'disable')),
+      onClick: onClick
+    }), children);
+  }
+  return /*#__PURE__*/React.createElement(Button, _extends({}, props, {
+    disabled: action.serialEffect === 'disable',
+    className: classNames(styles[action.riskLevel], _defineProperty({}, className, !!className)),
+    onClick: onClick
+  }), children);
+};
+var LDActions = function LDActions(_ref2) {
+  var max = _ref2.max,
+    display = _ref2.display,
+    todoList = _ref2.todoList,
+    className = _ref2.className,
+    _ref2$moreText = _ref2.moreText,
+    moreText = _ref2$moreText === void 0 ? '更多行为' : _ref2$moreText,
+    doAction = _ref2.doAction,
+    props = _objectWithoutProperties(_ref2, _excluded2);
+  var resources = getResources();
+  var handleClick = useMemoizedFn(function (action) {
+    if (action.riskLevel === 'danger') {
+      Modal.confirm({
+        title: "\u786E\u8BA4\u6267\u884C".concat(action.name, "\u884C\u4E3A\u64CD\u4F5C\u5417\uFF1F"),
+        onOk: function onOk() {
+          return doAction(action.actionPool);
+        }
+      });
+    } else if (action.riskLevel === 'destroy') {
+      recheck({
+        title: "\u786E\u8BA4\u6267\u884C".concat(action.name, "\u884C\u4E3A\u64CD\u4F5C\u5417\uFF1F"),
+        checkWords: "\u6267\u884C".concat(action.name),
+        onOk: function onOk() {
+          return doAction(action.actionPool);
+        }
+      });
+    } else {
+      doAction(action.actionPool);
+    }
+  });
+  var actionMap = useCreation(function () {
+    return reduce(todoList, function (ret, action, index) {
+      ret[action.serial] = _objectSpread(_objectSpread({}, action), {}, {
+        serialValue: 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;
+      return ret;
+    }, 0);
+  }, [resources, actionMap]);
+  var _useCreation = useCreation(function () {
+      var approvedActions = reduce(actionMap, function (ret, action) {
+        if (mySerialsValue & action.serialValue) {
+          ret.push(action);
+        } else if (action.serialEffect === 'disable') {
+          ret.push(action);
+        }
+        return ret;
+      }, []);
+      var _length = approvedActions.length;
+      var _permanent = approvedActions.splice(0, max >= _length ? _length : max - 1);
+      return [_permanent, approvedActions];
+    }, [max, mySerialsValue, actionMap]),
+    _useCreation2 = _slicedToArray(_useCreation, 2),
+    permanent = _useCreation2[0],
+    more = _useCreation2[1];
+  return /*#__PURE__*/React.createElement("div", _extends({
+    className: classNames(styles.ldActions, _defineProperty({}, className, !!className))
+  }, props), permanent.map(function (action, index) {
+    return /*#__PURE__*/React.createElement(Fragment, {
+      key: action.id
+    }, /*#__PURE__*/React.createElement(DisplayComp, {
+      display: display,
+      action: action,
+      onClick: function onClick() {
+        return handleClick(action);
+      }
+    }, action.name), display === 'text' && index < permanent.length - (more.length ? 0 : 1) && /*#__PURE__*/React.createElement(Divider, {
+      type: "vertical"
+    }));
+  }), !!more.length && /*#__PURE__*/React.createElement(Dropdown, {
+    overlay: /*#__PURE__*/React.createElement(Menu, {
+      onClick: function onClick(e) {
+        return handleClick(e.item.props.action);
+      }
+    }, more.map(function (action) {
+      return /*#__PURE__*/React.createElement(Menu.Item, {
+        key: action.id,
+        action: action,
+        disabled: action.serialEffect === 'disable'
+      }, /*#__PURE__*/React.createElement("span", {
+        className: classNames(styles[action.riskLevel], styles.menuItem)
+      }, action.name));
+    }))
+  }, /*#__PURE__*/React.createElement(DisplayComp, {
+    display: display,
+    action: {
+      riskLevel: 'default'
+    }
+  }, moreText, display !== 'text' && /*#__PURE__*/React.createElement(Icon, {
+    type: "down"
+  }))));
+};
+export default LDActions;

package/es/components/LDActions/index.less

@@ -0,0 +1,65 @@
+@spanDefault: #262626;
+@spanPrimary: var(--luck-color-primary);
+@spanDanger: #ff4d4f;
+@spanDestroy: #820014;
+
+.ldActions {
+
+  button:not(:last-child) {
+    margin-right: 8px;
+  }
+  span {
+    cursor: pointer;
+  }
+
+  button.default {
+    background-color: white;
+  }
+  span.default {
+    color: @spanDefault;
+  }
+
+  button.primary {
+    background-color: var(--luck-color-primary);
+    border-color: var(--luck-color-primary);
+    color: white;
+  }
+  span.primary {
+    color: @spanPrimary;
+  }
+
+  button.danger {
+    background-color: #ff4d4f;
+    border-color: #ff4d4f;
+    color: white;
+  }
+  span.danger {
+    color: @spanDanger;
+  }
+
+  button.destroy {
+    background-color: #820014;
+    border-color: #820014;
+    color: white;
+  }
+  span.destroy {
+    color: @spanDestroy;
+  }
+
+  span.disabled {
+    color: #bfbfbf;
+    cursor: not-allowed;
+  }
+}
+span.default.menuItem {
+  color: @spanDefault;
+}
+span.primary.menuItem {
+  color: @spanPrimary;
+}
+span.danger.menuItem {
+  color: @spanDanger;
+}
+span.destroy.menuItem {
+  color: @spanDestroy;
+}

package/es/components/LdAutoForm/index.js

@@ -65,7 +65,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
       }
     }, []);
     defaultValues.current = _defaultValues;
-    setFieldProps(_defineProperty({}, ldId, _nodes.map(function (i) {
+    setFieldProps && setFieldProps(_defineProperty({}, ldId, _nodes.map(function (i) {
       return _objectSpread({
         component: i.type.comName || i.type.displayName
       }, i.props);

package/es/components/LdCom/index.js

@@ -3,7 +3,8 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["options"];
 import React from 'react';
 import { Button, Tabs } from 'luck-design/antd';
-import { Collapse, ButtonRadio, IconFont } from '@luck-design-biz/base';
+import { Collapse, ButtonRadio } from '@luck-design-biz/base';
+import IconFont from "../IconFont";
 import { ldComBuilder, filterOptions, deepFilterCom } from "../../helper/ldComBuild";
 export var LdButton = ldComBuilder(Button);
 export var LdCollapse = ldComBuilder(Collapse);

package/es/components/LdFormList/index.js

@@ -8,11 +8,13 @@ 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 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
+  _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft", "serial"],
   _excluded4 = ["ldId", "initData", "overModel"];
 import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState } from 'react';
-import { connect, getDvaApp, useRouteMatch, useModel } from 'umi';
+import { connect, getDvaApp, useRouteMatch } from 'umi';
 import PropTypes from 'prop-types';
+import { isArray, sortBy, mapValues, reduce, includes } from 'lodash';
+import { BpmButton } from '@luck-design-biz/bpm';
 import { useCreation, useMemoizedFn, useAsyncEffect } from 'ahooks';
 import { BasicDivider } from 'luck-design';
 import { ChildrenUtil } from '@luck-design-biz/base/utils';
@@ -24,10 +26,7 @@ import { LuckDaContext } from "../Builder";
 import { LuckDaPopContext } from "../LdPop";
 import createModel from "./model";
 import { onBatchSubmitAction } from "../../helper/action";
-import { isArray, sortBy, mapValues } from 'lodash';
-import { BpmButton } from '@luck-design-biz/bpm';
 import { readBehaviorCall } from "../../services";
-import { parse, stringify } from 'querystring';
 
 // 组件
 var LdFormList = function LdFormList(_ref) {
@@ -196,8 +195,8 @@ var LdFormList = function LdFormList(_ref) {
       mainDataSetKey: mainDataSetKey
     }, function (success, mainKey, res) {
       setSubmitLoading(false);
-      var mainFormData = res.detail[res.list[0]];
       if (success) {
+        var mainFormData = res.detail[res.list[0]];
         if (afterSubmit) {
           afterSubmit(success, mainKey, res);
         } else {
@@ -223,7 +222,11 @@ var LdFormList = function LdFormList(_ref) {
     renderExtra: renderExtra
   });
   var formList = useCreation(function () {
-    return renderFormList(formConfig);
+    var _list = renderFormList(formConfig);
+    return reduce(_list, function (result, item) {
+      if (!item.serial || item.serialEffect === 'disable' || includes(resources, item.serial)) result.push(item);
+      return result;
+    }, []);
   }, [formConfig]);
   var formExtra = useCreation(function () {
     return renderFormExtra && isArray(renderFormExtra(formConfig)) ? renderFormExtra(formConfig) : [renderFormExtra(formConfig)];
@@ -231,7 +234,7 @@ var LdFormList = function LdFormList(_ref) {
   var mainDataSetKey = (_formList$find = formList.find(function (i) {
     return i.id === mainFormLdId;
   })) === null || _formList$find === void 0 ? void 0 : _formList$find.dataSetKey;
-  return /*#__PURE__*/React.createElement(FormList, _extends({
+  return formList.length > 0 ? /*#__PURE__*/React.createElement(FormList, _extends({
     editFlow: true,
     formState: formState,
     formMode: formMode,
@@ -264,17 +267,19 @@ var LdFormList = function LdFormList(_ref) {
         _ref8$header = _ref8.header,
         header = _ref8$header === void 0 ? 'collapse' : _ref8$header,
         title = _ref8.title,
-        _readOnly = _ref8.readOnly,
+        selfReadOnly = _ref8.readOnly,
         _ref8$extraConfig = _ref8.extraConfig,
         extraConfig = _ref8$extraConfig === void 0 ? {} : _ref8$extraConfig,
         _ref8$renderTopLeft = _ref8.renderTopLeft,
         _renderTopLeft = _ref8$renderTopLeft === void 0 ? function () {
           return /*#__PURE__*/React.createElement(React.Fragment, null);
         } : _ref8$renderTopLeft,
+        serial = _ref8.serial,
         _props = _objectWithoutProperties(_ref8, _excluded3);
       var _props$type = _props.type,
         type = _props$type === void 0 ? 'auto' : _props$type;
       var renderForm = type === 'auto' ? buildLdAutoForm : buildLdGridForm;
+      var _readOnly = selfReadOnly || serial && !includes(resources, serial);
       if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/React.createElement(Collapse, {
         title: title || ldId,
         extra: type === 'auto' && renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'),
@@ -319,7 +324,7 @@ var LdFormList = function LdFormList(_ref) {
         mode: child.props.mode || 'tab'
       }) : child.props);
     })[0];
-  }));
+  })) : null;
 };
 
 // 构建带有model的组件

package/es/components/LdGrid/index.js

@@ -6,7 +6,7 @@ var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "na
   _excluded2 = ["ldId", "moduleCode", "suppressInit", "overModel", "afterQuery", "isTreeGrid"];
 import React, { forwardRef, useImperativeHandle, useRef, useEffect } from 'react';
 import { getDvaApp } from 'umi';
-import { transform, includes, keyBy, union, keys, isNil } from 'lodash';
+import { transform, includes, keyBy, union, keys, isNil, isFunction } from 'lodash';
 import { useCreation } from 'ahooks';
 import PropTypes from 'prop-types';
 import { build } from '@luck-design-biz/base/Component';
@@ -88,10 +88,16 @@ var LdGrid = function LdGrid(_ref) {
    * columnsRewrite 覆盖模块管理配置，是否展示以模块管理配置为主，自己可以用hide来隐藏某字段
    */
   var _columns = useCreation(function () {
-    if (columnsReset) return columnsReset;
+    if (columnsReset) {
+      if (isFunction) {
+        return columnsReset(columns);
+      }
+      return columnsReset;
+    }
+    var _columnsRewrite = isFunction(columnsRewrite) ? columnsRewrite(columns) : columnsRewrite;
     var defaultColumns = keyBy(columns, 'aliaName');
-    var customColumns = keyBy(columnsRewrite, 'field');
-    var mergeFields = union(keys(defaultColumns), keys(customColumns));
+    var customColumns = keyBy(_columnsRewrite, 'field');
+    var mergeFields = union(keys(customColumns), keys(defaultColumns));
     return transform(mergeFields, function (result, field) {
       var _customColumns$field;
       if ((_customColumns$field = customColumns[field]) !== null && _customColumns$field !== void 0 && _customColumns$field.hide) {
@@ -172,11 +178,11 @@ var LdIndex = function LdIndex(_ref2) {
     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({
-        isFlow: isTreeGrid || !!props.isFlow
+        behaviorKey: isTreeGrid ? 'readTree' : 'readGrid'
       }, overModel), {}, {
-        dataSetKey: props.dataSetKey,
+        isFlow: isTreeGrid || !!props.isFlow,
         moduleCode: moduleCode,
-        behaviorKey: isTreeGrid ? 'readTree' : 'readGrid',
+        dataSetKey: props.dataSetKey,
         afterQuery: afterQuery
       })));
     }
@@ -184,7 +190,7 @@ var LdIndex = function LdIndex(_ref2) {
       suppressInit: suppressInit,
       afterInit: props.afterInit
     });
-  }, [namespace]);
+  }, [namespace, props.dataSetKey]);
   return /*#__PURE__*/React.createElement(Component, _extends({
     isTreeGrid: isTreeGrid,
     namespace: namespace

package/es/components/LdGridForm/index.js

@@ -2,8 +2,8 @@ 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", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode"];
-import React, { createRef, useContext } from 'react';
+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"];
+import React, { createRef, useContext, useEffect } from 'react';
 import { transform } from 'lodash';
 import classNames from 'classnames';
 import ldBuilder from "../../helper/ldBuilder";
@@ -25,6 +25,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     dataSetKey = _ref.dataSetKey,
     _ref$columnsRewrite = _ref.columnsRewrite,
     columnsRewrite = _ref$columnsRewrite === void 0 ? [] : _ref$columnsRewrite,
+    columnsReset = _ref.columnsReset,
     _ref$onQuery = _ref.onQuery,
     onQuery = _ref$onQuery === void 0 ? {} : _ref$onQuery,
     _ref$onAdd = _ref.onAdd,
@@ -84,7 +85,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
       }
     }, []);
     defaultValues.current = _defaultValues;
-    setFieldProps(_defineProperty({}, ldId, _nodes.map(function (col) {
+    setFieldProps && setFieldProps(_defineProperty({}, ldId, _nodes.map(function (col) {
       var node = col.renderBasicFormItem();
       var renderBasicFormItem = node === null || node === void 0 ? void 0 : node.props;
       return _objectSpread(_objectSpread({}, col), {}, {
@@ -93,7 +94,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
         }, renderBasicFormItem)
       });
     })));
-    return _nodes;
+    return columnsReset ? columnsReset(_nodes) : _nodes;
   }();
   var defaultDataSource = _objectSpread(_objectSpread({}, formItemDataFormat(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
   var formConfig = {

package/es/components/LdRuntimeCom/index.js

@@ -1,8 +1,15 @@
+import _construct from "@babel/runtime/helpers/esm/construct";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["children"];
 import React, { useEffect, useState } from 'react';
 import * as Babel from '@babel/standalone';
 import * as LuckAntd from 'luck-design/antd';
 import * as LuckDesign from 'luck-design';
+import * as Lodash from 'lodash';
+import * as ahooks from 'ahooks';
+import { keys } from 'lodash';
 
 /**
  * 实时代码渲染组件
@@ -10,7 +17,8 @@ import * as LuckDesign from 'luck-design';
  * todo：Loading效果的优化
  */
 var LdRuntimeCom = function LdRuntimeCom(_ref) {
-  var children = _ref.children;
+  var children = _ref.children,
+    rest = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     Component = _useState2[0],
@@ -23,20 +31,25 @@ var LdRuntimeCom = function LdRuntimeCom(_ref) {
         presets: ['react']
       }).code;
 
-      // 输出编译后的代码用于排错
-      console.log('transformedCode', transformedCode);
-
       // 自动
       var functionNameMatch = transformedCode.match(/function\s+([^\s(]+)/);
       if (functionNameMatch && functionNameMatch.length > 1) {
         var functionName = functionNameMatch[1];
-        var execute = new Function('React', 'LuckAntd', 'LuckDesign', "".concat(transformedCode, "; return ").concat(functionName, ";"));
+        var argsName = keys(rest);
+        var _args = argsName.map(function (n) {
+          return rest[n];
+        });
+        var execute = _construct(Function, ['React', 'LuckAntd', 'LuckDesign', 'libs'].concat(_toConsumableArray(argsName), ["".concat(transformedCode, "; return ").concat(functionName, ";")]));
         // 设置组件状态
-        var ReactComponent = execute(React, LuckAntd, LuckDesign);
+        var ReactComponent = execute.apply(void 0, [React, LuckAntd, LuckDesign, {
+          Lodash: Lodash,
+          ahooks: ahooks
+        }].concat(_toConsumableArray(_args)));
         setComponent( /*#__PURE__*/React.createElement(ReactComponent, null));
       }
     }
   }, [code]);
-  return Component ? Component : /*#__PURE__*/React.createElement("div", null, "Loading...");
+  if (code === '') return null;
+  return Component ? Component : 'JSX Component';
 };
 export default LdRuntimeCom;