@luck-design-biz/luckda 0.0.11 → 0.0.12

package/es/components/LdFormList/index.js

@@ -4,7 +4,7 @@ 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", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
-  _excluded2 = ["id", "header", "title", "readOnly", "extraConfig"],
+  _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';
@@ -87,15 +87,9 @@ var LdFormList = function LdFormList(_ref) {
     });
     onValueChange(change, data);
   });
-  var renderExtra = useMemoizedFn(function (formId, extraConfig) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, window['g_sessionStore'].get(window.appConfig['matchPresetAdmin']) === '1' && RUNTIME === 'dev' && /*#__PURE__*/React.createElement("a", {
-      onClick: function onClick() {
-        return readFieldProps(formId);
-      }
-    }, formatMessage({
-      id: 'app.luckda.button.readConfig',
-      label: '查看配置'
-    })), /*#__PURE__*/React.createElement(FormBtn, _extends({
+  var renderExtra = useMemoizedFn(function (formId, extraConfig, type) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FormBtn, _extends({
+      type: type,
       formId: formId
     }, extraConfig)));
   });
@@ -190,13 +184,17 @@ var LdFormList = function LdFormList(_ref) {
       _readOnly = _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,
       _props = _objectWithoutProperties(_ref8, _excluded2);
     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: renderExtra(ldId, extraConfig),
+      extra: type === 'auto' && renderExtra(ldId, extraConfig, 'graphic'),
       id: ldId,
       key: ldId,
       mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
@@ -208,18 +206,21 @@ var LdFormList = function LdFormList(_ref) {
       onValueChange: handleValueChange,
       ticketData: props.ticketData,
       formRef: formListRef,
-      formMode: formMode
+      formMode: formMode,
+      renderTopLeft: function renderTopLeft() {
+        return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
+      }
     })));
     return /*#__PURE__*/React.createElement(Fragment, {
       key: ldId
     }, header === 'divider' && /*#__PURE__*/React.createElement(BasicDivider, {
       title: title || ldId,
       id: ldId
-    }), /*#__PURE__*/React.createElement("div", {
+    }), type === 'auto' && /*#__PURE__*/React.createElement("div", {
       style: {
         textAlign: 'right'
       }
-    }, renderExtra(ldId, extraConfig)), renderForm(_objectSpread(_objectSpread({}, _props), {}, {
+    }, renderExtra(ldId, extraConfig, 'graphic')), renderForm(_objectSpread(_objectSpread({}, _props), {}, {
       ldId: ldId,
       mainFormLdId: mainFormLdId,
       mainDataSetKey: mainDataSetKey,
@@ -227,7 +228,10 @@ var LdFormList = function LdFormList(_ref) {
       onValueChange: handleValueChange,
       ticketData: props.ticketData,
       formRef: formListRef,
-      formMode: formMode
+      formMode: formMode,
+      renderTopLeft: function renderTopLeft() {
+        return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'graphic'), _renderTopLeft()];
+      }
     })));
   }), ChildrenUtil.deepMap(renderFormExtra(formConfig), function (child) {
     var _child$type;

package/es/helper/action.js

@@ -21,7 +21,9 @@ export var doAction = function doAction(action) {
     showConfirm = _ref$showConfirm === void 0 ? true : _ref$showConfirm,
     callback = _ref.callback,
     _ref$showPopWhenSucce = _ref.showPopWhenSuccess,
-    showPopWhenSuccess = _ref$showPopWhenSucce === void 0 ? true : _ref$showPopWhenSucce;
+    showPopWhenSuccess = _ref$showPopWhenSucce === void 0 ? true : _ref$showPopWhenSucce,
+    _ref$customAction = _ref.customAction,
+    customAction = _ref$customAction === void 0 ? false : _ref$customAction;
   var _ref2 = arguments.length > 3 ? arguments[3] : undefined,
     _ref2$actions = _ref2.actions,
     actions = _ref2$actions === void 0 ? {} : _ref2$actions,
@@ -50,19 +52,31 @@ export var doAction = function doAction(action) {
       post = data;
     }
     var handleAction = function handleAction() {
-      behaviorCall(_objectSpread({
-        behaviorKey: action,
-        moduleCode: moduleCode
-      }, get), post).then(function (res) {
-        var code = res.code,
-          _data = res.data;
-        callback && callback(code === 1, _data, res);
-        if (code === 1 && showPopWhenSuccess) {
-          showPop(formatMessage({
-            id: 'app.base.tip.operate.success'
-          }), null, 'success');
-        }
-      });
+      if (customAction) {
+        customAction({
+          api: behaviorCall,
+          get: _objectSpread({
+            behaviorKey: action,
+            moduleCode: moduleCode
+          }, get),
+          post: post
+        });
+      } else {
+        behaviorCall(_objectSpread({
+          behaviorKey: action,
+          moduleCode: moduleCode
+        }, get), post).then(function (res) {
+          var code = res.code,
+            _data = res.data;
+          callback && callback(code === 1, _data, res);
+          if (code === 1 && showPopWhenSuccess) {
+            showPop(formatMessage({
+              id: 'app.base.tip.operate.success'
+            }), null, 'success');
+          }
+        });
+      }
+      ;
     };
     showConfirm ? makeSure(handleAction) : handleAction();
   } else {

package/es/helper/index.less

@@ -0,0 +1,7 @@
+.ldLabs{
+  :global{
+    .ant-tabs-bar{
+      margin: 0 0 4px 0;
+    }
+  }
+}

package/es/helper/ldComBuild.js

@@ -1,7 +1,13 @@
+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 = ["className"];
 import React, { useContext, Fragment } from 'react';
 import { includes, intersectionWith } from 'lodash';
 import { ChildrenUtil } from '@luck-design-biz/base/utils';
 import { LuckDaContext } from '../components/Builder';
+import classNames from 'classnames';
+import styles from './index.less';
 export var getResources = function getResources() {
   var _ref = useContext(LuckDaContext) || {},
     _ref$resources = _ref.resources,
@@ -25,9 +31,13 @@ export var filterOptions = function filterOptions(options) {
   });
 };
 export var deepFilterCom = function deepFilterCom(Com, childMark) {
-  var Component = function Component(props) {
+  var Component = function Component(_ref2) {
+    var className = _ref2.className,
+      props = _objectWithoutProperties(_ref2, _excluded);
     var resources = getResources();
-    var com = /*#__PURE__*/React.createElement(Com, props);
+    var com = /*#__PURE__*/React.createElement(Com, _extends({}, props, {
+      className: classNames(styles.ldLabs, _defineProperty({}, className, !!className))
+    }));
     return ChildrenUtil.deepFilter(com, function (child) {
       var _child$props;
       var data = !childMark(child) || !(child === null || child === void 0 ? void 0 : (_child$props = child.props) === null || _child$props === void 0 ? void 0 : _child$props.resource) || includes(resources, child.props.resource);

package/es/utils/grid.js

@@ -23,7 +23,7 @@ export function getColumnRender(name, type) {
     case 'textarea':
       render = function render(text, record) {
         var _props$config;
-        return record["".concat(name, "_virtual")] || (((_props$config = props.config) === null || _props$config === void 0 ? void 0 : _props$config.precision) && text ? text.toFixed(props.config.precision) : text);
+        return record["".concat(name, "_virtual")] || (((_props$config = props.config) === null || _props$config === void 0 ? void 0 : _props$config.precision) && text ? Number(text).toFixed(props.config.precision) : text);
       };
       break;
     case 'date':
@@ -107,13 +107,13 @@ export var getGridColumn = function getGridColumn() {
         data.filter = 'select';
         data.filterParams = {
           options: [{
-            key: 0,
+            value: 0,
             label: formatMessage({
               id: 'app.base.state.no',
               label: '否'
             })
           }, {
-            key: 1,
+            value: 1,
             label: formatMessage({
               id: 'app.base.state.yes',
               label: '是'

package/lib/components/LdFormList/index.js

@@ -27,7 +27,7 @@ var _LdPop = require("../LdPop");
 var _model = _interopRequireDefault(require("./model"));
 var _action = require("../../helper/action");
 var _excluded = ["namespace", "formState", "formMode", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
-  _excluded2 = ["id", "header", "title", "readOnly", "extraConfig"],
+  _excluded2 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
   _excluded3 = ["ldId", "initData", "overModel"];
 // 组件
 var LdFormList = function LdFormList(_ref) {
@@ -94,15 +94,9 @@ var LdFormList = function LdFormList(_ref) {
     });
     onValueChange(change, data);
   });
-  var renderExtra = (0, _ahooks.useMemoizedFn)(function (formId, extraConfig) {
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, window['g_sessionStore'].get(window.appConfig['matchPresetAdmin']) === '1' && RUNTIME === 'dev' && /*#__PURE__*/_react.default.createElement("a", {
-      onClick: function onClick() {
-        return readFieldProps(formId);
-      }
-    }, (0, _utils.formatMessage)({
-      id: 'app.luckda.button.readConfig',
-      label: '查看配置'
-    })), /*#__PURE__*/_react.default.createElement(_FormList.FormBtn, (0, _extends2.default)({
+  var renderExtra = (0, _ahooks.useMemoizedFn)(function (formId, extraConfig, type) {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_FormList.FormBtn, (0, _extends2.default)({
+      type: type,
       formId: formId
     }, extraConfig)));
   });
@@ -197,13 +191,17 @@ var LdFormList = function LdFormList(_ref) {
       _readOnly = _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.default.createElement(_react.default.Fragment, null);
+      } : _ref8$renderTopLeft,
       _props = (0, _objectWithoutProperties2.default)(_ref8, _excluded2);
     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: renderExtra(ldId, extraConfig),
+      extra: type === 'auto' && renderExtra(ldId, extraConfig, 'graphic'),
       id: ldId,
       key: ldId,
       mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
@@ -215,18 +213,21 @@ var LdFormList = function LdFormList(_ref) {
       onValueChange: handleValueChange,
       ticketData: props.ticketData,
       formRef: formListRef,
-      formMode: formMode
+      formMode: formMode,
+      renderTopLeft: function renderTopLeft() {
+        return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
+      }
     })));
     return /*#__PURE__*/_react.default.createElement(_react.Fragment, {
       key: ldId
     }, header === 'divider' && /*#__PURE__*/_react.default.createElement(_luckDesign.BasicDivider, {
       title: title || ldId,
       id: ldId
-    }), /*#__PURE__*/_react.default.createElement("div", {
+    }), type === 'auto' && /*#__PURE__*/_react.default.createElement("div", {
       style: {
         textAlign: 'right'
       }
-    }, renderExtra(ldId, extraConfig)), renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
+    }, renderExtra(ldId, extraConfig, 'graphic')), renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
       ldId: ldId,
       mainFormLdId: mainFormLdId,
       mainDataSetKey: mainDataSetKey,
@@ -234,7 +235,10 @@ var LdFormList = function LdFormList(_ref) {
       onValueChange: handleValueChange,
       ticketData: props.ticketData,
       formRef: formListRef,
-      formMode: formMode
+      formMode: formMode,
+      renderTopLeft: function renderTopLeft() {
+        return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'graphic'), _renderTopLeft()];
+      }
     })));
   }), _utils.ChildrenUtil.deepMap(renderFormExtra(formConfig), function (child) {
     var _child$type;

package/lib/helper/action.js

@@ -28,7 +28,9 @@ var doAction = function doAction(action) {
     showConfirm = _ref$showConfirm === void 0 ? true : _ref$showConfirm,
     callback = _ref.callback,
     _ref$showPopWhenSucce = _ref.showPopWhenSuccess,
-    showPopWhenSuccess = _ref$showPopWhenSucce === void 0 ? true : _ref$showPopWhenSucce;
+    showPopWhenSuccess = _ref$showPopWhenSucce === void 0 ? true : _ref$showPopWhenSucce,
+    _ref$customAction = _ref.customAction,
+    customAction = _ref$customAction === void 0 ? false : _ref$customAction;
   var _ref2 = arguments.length > 3 ? arguments[3] : undefined,
     _ref2$actions = _ref2.actions,
     actions = _ref2$actions === void 0 ? {} : _ref2$actions,
@@ -57,19 +59,31 @@ var doAction = function doAction(action) {
       post = data;
     }
     var handleAction = function handleAction() {
-      (0, _utils2.behaviorCall)((0, _objectSpread2.default)({
-        behaviorKey: action,
-        moduleCode: moduleCode
-      }, get), post).then(function (res) {
-        var code = res.code,
-          _data = res.data;
-        callback && callback(code === 1, _data, res);
-        if (code === 1 && showPopWhenSuccess) {
-          (0, _utils.showPop)((0, _utils.formatMessage)({
-            id: 'app.base.tip.operate.success'
-          }), null, 'success');
-        }
-      });
+      if (customAction) {
+        customAction({
+          api: _utils2.behaviorCall,
+          get: (0, _objectSpread2.default)({
+            behaviorKey: action,
+            moduleCode: moduleCode
+          }, get),
+          post: post
+        });
+      } else {
+        (0, _utils2.behaviorCall)((0, _objectSpread2.default)({
+          behaviorKey: action,
+          moduleCode: moduleCode
+        }, get), post).then(function (res) {
+          var code = res.code,
+            _data = res.data;
+          callback && callback(code === 1, _data, res);
+          if (code === 1 && showPopWhenSuccess) {
+            (0, _utils.showPop)((0, _utils.formatMessage)({
+              id: 'app.base.tip.operate.success'
+            }), null, 'success');
+          }
+        });
+      }
+      ;
     };
     showConfirm ? makeSure(handleAction) : handleAction();
   } else {

package/lib/helper/index.less

@@ -0,0 +1,7 @@
+.ldLabs{
+  :global{
+    .ant-tabs-bar{
+      margin: 0 0 4px 0;
+    }
+  }
+}

package/lib/helper/ldComBuild.js

@@ -1,14 +1,21 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ldComBuilder = exports.getResources = exports.filterOptions = exports.deepFilterCom = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _lodash = require("lodash");
 var _utils = require("@luck-design-biz/base/utils");
 var _Builder = require("../components/Builder");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _index = _interopRequireDefault(require("./index.less"));
+var _excluded = ["className"];
 var getResources = function getResources() {
   var _ref = (0, _react.useContext)(_Builder.LuckDaContext) || {},
     _ref$resources = _ref.resources,
@@ -35,9 +42,13 @@ var filterOptions = function filterOptions(options) {
 };
 exports.filterOptions = filterOptions;
 var deepFilterCom = function deepFilterCom(Com, childMark) {
-  var Component = function Component(props) {
+  var Component = function Component(_ref2) {
+    var className = _ref2.className,
+      props = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
     var resources = getResources();
-    var com = /*#__PURE__*/_react.default.createElement(Com, props);
+    var com = /*#__PURE__*/_react.default.createElement(Com, (0, _extends2.default)({}, props, {
+      className: (0, _classnames.default)(_index.default.ldLabs, (0, _defineProperty2.default)({}, className, !!className))
+    }));
     return _utils.ChildrenUtil.deepFilter(com, function (child) {
       var _child$props;
       var data = !childMark(child) || !(child === null || child === void 0 ? void 0 : (_child$props = child.props) === null || _child$props === void 0 ? void 0 : _child$props.resource) || (0, _lodash.includes)(resources, child.props.resource);

package/lib/utils/grid.js

@@ -30,7 +30,7 @@ function getColumnRender(name, type) {
     case 'textarea':
       render = function render(text, record) {
         var _props$config;
-        return record["".concat(name, "_virtual")] || (((_props$config = props.config) === null || _props$config === void 0 ? void 0 : _props$config.precision) && text ? text.toFixed(props.config.precision) : text);
+        return record["".concat(name, "_virtual")] || (((_props$config = props.config) === null || _props$config === void 0 ? void 0 : _props$config.precision) && text ? Number(text).toFixed(props.config.precision) : text);
       };
       break;
     case 'date':
@@ -114,13 +114,13 @@ var getGridColumn = function getGridColumn() {
         data.filter = 'select';
         data.filterParams = {
           options: [{
-            key: 0,
+            value: 0,
             label: (0, _utils.formatMessage)({
               id: 'app.base.state.no',
               label: '否'
             })
           }, {
-            key: 1,
+            value: 1,
             label: (0, _utils.formatMessage)({
               id: 'app.base.state.yes',
               label: '是'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -40,33 +40,14 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.9",
-    "@province-city-china/level": "^8.5.4",
     "ahooks": "^3.7.0",
     "antd": "^3.26.6",
-    "bpmn-js": "^7.3.0",
-    "bpmn-js-properties-panel": "^0.35.0",
     "classnames": "^2.3.1",
-    "d3-fetch": "^1.2.0",
-    "d3-selection": "^1.4.1",
-    "file-saver": "^2.0.2",
-    "jointjs": "^3.5.4",
-    "js-file-download": "^0.4.4",
     "lodash": "^4.17.11",
     "moment": "^2.24.0",
-    "nprogress": "^0.2.0",
-    "path-to-regexp": "^2.4.0",
-    "postcss-hash-classname": "^0.4.0",
-    "postcss-prefixer": "^2.1.3",
-    "promise-sequential": "^1.1.1",
     "prop-types": "^15.8.1",
     "querystring": "^0.2.0",
-    "raphael": "^2.3.0",
-    "rc-form": "^2.4.10",
-    "react": "^16.12.0",
-    "react-copy-to-clipboard": "^5.0.1",
-    "react-country-flag": "^2.3.0",
-    "react-dom": "16.8.0",
-    "uuid": "^3.3.2"
+    "react": "^16.12.0"
   },
   "devDependencies": {
     "@umijs/test": "^3.0.5",