@luck-design-biz/luckda 1.0.0-alpha → 1.0.1

package/lib/lowcode/view/lc-components/Split/index.js

@@ -11,9 +11,10 @@ var _ahooks = require("ahooks");
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _lodash = require("lodash");
 var _base = require("@luck-design-biz/base");
+var _ContextProvider = require("../../../engine/provider/ContextProvider");
+var _Wrapper = _interopRequireDefault(require("../Wrapper"));
 var _helper = require("../../../engine/tools/helper");
 var _splitPropsDefault = _interopRequireDefault(require("../../../engine/meta/split.props.default.json"));
-var _Wrapper = _interopRequireDefault(require("../Wrapper"));
 var _MAPPING_ = {
   left: 'min',
   up: 'min',
@@ -30,8 +31,16 @@ var LCSplit = function LCSplit(_ref) {
   var id = _ref.id,
     children = _ref.children,
     css = _ref.css,
-    display = _ref.display;
+    display = _ref.display,
+    advance = _ref.advance;
   var ref = (0, _react.useRef)();
+  var ctx = (0, _ContextProvider.useContext)();
+  (0, _react.useEffect)(function () {
+    ctx.doAction(advance.events.onMount);
+    return function () {
+      return ctx.doAction(advance.events.onUnmount);
+    };
+  }, []);
   var getTargetDom = (0, _ahooks.useMemoizedFn)(function () {
     return ref.current;
   });
@@ -46,6 +55,11 @@ var LCSplit = function LCSplit(_ref) {
     }, [display.ratio]),
     ratioArr = _useCreation.ratioArr,
     total = _useCreation.total;
+  var handleChange = (0, _ahooks.useMemoizedFn)(function (value) {
+    ctx.doAction(advance.events.onChange, {
+      value: value
+    });
+  });
   return /*#__PURE__*/_react.default.createElement(_Wrapper.default, {
     id: id,
     displayName: "Split",
@@ -54,7 +68,8 @@ var LCSplit = function LCSplit(_ref) {
     ref: ref,
     $css: css
   }, /*#__PURE__*/_react.default.createElement(_base.MemorySplit, {
-    split: display.split
+    split: display.split,
+    onChange: handleChange
   }, ratioArr.map(function (r, i) {
     return /*#__PURE__*/_react.default.createElement(_base.MemorySplit.Pane, {
       fastTo: !display.fastTo || i === display.fastTo.length ? 'max' : _MAPPING_[display.fastTo[i]],

package/lib/lowcode/view/lc-components/Split/meta.json

@@ -27,7 +27,7 @@
       ]
     }
   ],
-  "css": "width: 100%, height: 100%, background-color: transparent",
+  "css": "width: 100%; height: 100%; background-color: transparent;",
   "advance": {
     "events": [
       {

package/lib/lowcode/view/lc-components/Table/index.js

@@ -1,13 +1,14 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -22,11 +23,13 @@ var _Wrapper = _interopRequireDefault(require("../Wrapper"));
 var _index = require("../../../../index");
 var _TopFilter = _interopRequireDefault(require("./components/TopFilter"));
 var _TopImex = require("./components/TopImex");
+var _RuntimeComp = _interopRequireDefault(require("../JSX/RuntimeComp"));
 var _helper = require("../../../engine/tools/helper");
 var _useCombinedRefs = _interopRequireDefault(require("../../../engine/tools/useCombinedRefs"));
 var _tablePropsDefault = _interopRequireDefault(require("../../../engine/meta/table.props.default.json"));
 var _constants = require("../../../constants");
 var _apiUrl2 = require("../../../constants/api-url");
+var _excluded = ["render"];
 var moduleCode = (0, _helper.getLDMetaAttr)('moduleCode');
 var LCTable = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var id = _ref.id,
@@ -79,6 +82,18 @@ var LCTable = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
        */
       getInstance: function getInstance() {
         return instanceRef.current;
+      },
+      /**
+       * 刷新表格
+       * @method
+       */
+      refresh: function refresh() {
+        var init = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+        return instanceRef.current.onLdQuery(init ? {
+          removeAll: {
+            operate: 'removeAll'
+          }
+        } : null);
       }
     };
   });
@@ -376,8 +391,19 @@ var LCTable = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     if (!(0, _lodash.isNil)(columnsRewrite) || !(0, _lodash.isNil)(fields)) {
       temp.columnsRewrite = function (cols) {
         var colsMap = (0, _lodash.keyBy)(cols, 'field');
-        var _cols = (0, _lodash.isNil)(fields) ? cols : fields.map(function (_field) {
-          return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colsMap[_field.field]), _field);
+        var _cols = (0, _lodash.isNil)(fields) ? cols : fields.map(function (_ref4) {
+          var render = _ref4.render,
+            _field = (0, _objectWithoutProperties2.default)(_ref4, _excluded);
+          return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colsMap[_field.field]), {}, {
+            render: render ? function (v, d, i, p) {
+              return /*#__PURE__*/_react.default.createElement(_RuntimeComp.default, {
+                value: v,
+                data: d,
+                rowIndex: i,
+                params: p
+              }, render.replace(/(function\s*\w*\s*)\([^)]*\)(\s*{)/, '$1()$2'));
+            } : null
+          }, _field);
         });
         return (0, _lodash.isNil)(columnsRewrite) ? _cols : (0, _helper.executeCode)(ctx, columnsRewrite, ['columns'], _cols);
       };
@@ -520,7 +546,7 @@ var LCTable = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     });
   });
   var _afterQuery = (0, _ahooks.useMemoizedFn)(function (res) {
-    if (res.code === 1 && !res.list.includes(instanceRef.current.expectRowKey)) {
+    if (res.code === 1 && instanceRef.current && !res.list.includes(instanceRef.current.expectRowKey)) {
       instanceRef.current.expectRowKey = res.list[0];
       ctx.doAction(advance.events.onExpectRowChanged, {
         data: res.detail[res.list[0]]

package/lib/lowcode/view/lc-components/Table/meta.json

@@ -384,13 +384,13 @@
         "key": "onMount",
         "name": "组件首次渲染时",
         "desc": "在组件首次渲染时，执行方法",
-        "func": "function onMount(params) {\n\t\n}"
+        "func": "function onMount(params, datasetCode) {\n\t\n}"
       },
       {
         "key": "onUnmount",
         "name": "组件卸载时",
         "desc": "在组件卸载时，执行方法。",
-        "func": "function onUnmount() {\n\t\n}"
+        "func": "function onUnmount(datasetCode) {\n\t\n}"
       },
       {
         "key": "onRowClick",

package/lib/lowcode/view/lc-components/Tabs/index.js

@@ -11,6 +11,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactDom = require("react-dom");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _ahooks = require("ahooks");
+var _lodash = require("lodash");
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _antd = require("luck-design/antd");
 var _ContextProvider = require("../../../engine/provider/ContextProvider");
@@ -39,25 +40,27 @@ var LCTabs = function LCTabs(_ref) {
   var ref = (0, _react.useRef)();
   var apiRef = (0, _react.useRef)();
   var ctx = (0, _ContextProvider.useContext)();
+  var _items = (0, _ahooks.useCreation)(function () {
+    return items.filter(function (_ref2) {
+      var serial = _ref2.serial;
+      return (0, _lodash.isNil)(serial) || ctx.want(serial);
+    });
+  }, [items]);
   var _useState = (0, _react.useState)(function () {
-      return (items.find(function (_ref2) {
-        var active = _ref2.active;
+      return (_items.find(function (_ref3) {
+        var active = _ref3.active;
         return active;
-      }) || items[0]).id;
+      }) || _items[0]).id;
     }),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     activeKey = _useState2[0],
     setActiveKey = _useState2[1];
-  (0, _ahooks.useMount)(function () {
-    ctx.doAction(advance.events.onMount, {
-      instance: ref.current
-    });
-  });
-  (0, _ahooks.useUnmount)(function () {
-    ctx.doAction(advance.events.onUnmount, {
-      instance: ref.current
-    });
-  });
+  (0, _react.useEffect)(function () {
+    ctx.doAction(advance.events.onMount);
+    return function () {
+      ctx.doAction(advance.events.onUnmount);
+    };
+  }, []);
   var handleTabClick = (0, _ahooks.useMemoizedFn)(function (tabKey, e) {
     setActiveKey(tabKey);
     ctx.doAction(advance.events.onTabClick, {
@@ -89,7 +92,7 @@ var LCTabs = function LCTabs(_ref) {
     tabBarExtraContent: tabBarExtraContent ? /*#__PURE__*/_react.default.createElement(_RuntimeComp.default, null, tabBarExtraContent) : null,
     $css: css,
     onTabClick: handleTabClick
-  }, items.map(function (item) {
+  }, _items.map(function (item) {
     return /*#__PURE__*/_react.default.createElement(_antd.Tabs.TabPane, {
       tab: item.name,
       key: item.id,

package/lib/lowcode/view/lc-components/Text/index.js

@@ -11,6 +11,7 @@ var _ahooks = require("ahooks");
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _Wrapper = _interopRequireDefault(require("../Wrapper"));
 var _ContextProvider = require("../../../engine/provider/ContextProvider");
+var _RuntimeComp = _interopRequireDefault(require("../JSX/RuntimeComp"));
 var _helper = require("../../../engine/tools/helper");
 var _textPropsDefault = _interopRequireDefault(require("../../../engine/meta/text.props.default.json"));
 var StyledText = _styledComponents.default.div.withConfig({
@@ -44,6 +45,12 @@ var LCText = function LCText(_ref) {
       e: e
     });
   });
+  var _content = (0, _ahooks.useCreation)(function () {
+    if (content.code) {
+      return /*#__PURE__*/_react.default.createElement(_RuntimeComp.default, null, content.code);
+    }
+    return content.text;
+  }, [content]);
   var getTargetDom = (0, _ahooks.useMemoizedFn)(function () {
     return ref.current;
   });
@@ -56,7 +63,7 @@ var LCText = function LCText(_ref) {
     $css: css,
     $max: maxLine,
     onClick: handleClick
-  }, content));
+  }, _content));
 };
 LCText.defaultProps = (0, _helper.omitBadProps)(_textPropsDefault.default);
 var _default = exports.default = LCText;

package/lib/lowcode/view/lc-components/Text/meta.json

@@ -15,22 +15,22 @@
     },
     {
       "key": "content",
-      "name": "内容",
-      "desc": "文本内容设置",
-      "type": "_I18nInput",
-      "default": "文本",
+      "name": "#内容",
+      "type": "_TextContent",
+      "default": {"text": "文本内容"},
       "wrapped": "textarea",
+      "wrapper": "hidden",
       "repositioning": true
     },
     {
       "key": "maxLine",
       "name": "最大行数",
-      "desc": "超出时自动省略号展示",
+      "desc": "超出时自动省略号展示，0表示不限制行数",
       "type": "number",
       "default": 0
     }
   ],
-  "css": {},
+  "css": "",
   "advance": {
     "events": [
       {

package/lib/lowcode/view/lc-components/Wrapper.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
 var _lodash = require("lodash");
@@ -41,7 +42,21 @@ var LCWrapper = function LCWrapper(_ref) {
     };
     ctx._register(id, new Proxy({
       id: id,
-      meta: (0, _lodash.omit)(meta, ['props', 'css', 'advance'])
+      meta: (0, _lodash.omit)(meta, ['props', 'css', 'advance']),
+      set: function set(prop, value, toDom) {
+        if (toDom === true) {
+          if (['id', _constants.LC_COMPONENT_UNIT_KEY].includes(prop)) {
+            return;
+          }
+          var dom = getTargetDom();
+          dom.setAttribute(prop, value);
+          return;
+        }
+        (0, _ContextProvider.modifyNode)(id, (0, _defineProperty2.default)({}, prop, value));
+      },
+      get: function get(prop) {
+        return _selfData.current.props[prop];
+      }
     }, {
       get: function get(target, property, receiver) {
         if (property === 'api') {

package/lib/lowcode/view/style/loading.less

@@ -1,3 +1,17 @@
+.masker {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1000;
+  background-color: transparent;
+  backdrop-filter: blur(6px);
+  cursor: none;
+}
+*:has(> .masker) {
+  position: relative;
+}
 .lc-painter-loading {
   position: absolute;
   height: 64px;

package/lib/services.js

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.noAuthTransformCode = noAuthTransformCode;
 exports.readModlue = readModlue;
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -27,4 +28,23 @@ function _readModlue() {
     }, _callee);
   }));
   return _readModlue.apply(this, arguments);
+}
+function noAuthTransformCode(_x2) {
+  return _noAuthTransformCode.apply(this, arguments);
+}
+function _noAuthTransformCode() {
+  _noAuthTransformCode = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(params) {
+    return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          return _context2.abrupt("return", (0, _utils.request)("".concat(_ApiConfig.default.BASE_HOST, "/page/option/noAuthTransformCode"), {
+            params: params
+          }));
+        case 1:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _noAuthTransformCode.apply(this, arguments);
 }

package/lib/upload/Form/gridForm.js

@@ -87,7 +87,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
   var _getDvaApp$_store$get = (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store.getState().user,
     currentUser = _getDvaApp$_store$get.currentUser;
   var supportUploadTypes = (0, _ahooks.useCreation)(function () {
-    return (0, _utils.getSupportUploadTypes)(forbiddenTypes);
+    return (0, _utils.getSupportUploadTypes)(forbiddenTypes, supportTypes);
   }, [forbiddenTypes, supportTypes]);
 
   // 下载
@@ -279,6 +279,9 @@ var UploadGridForm = function UploadGridForm(_ref) {
 
   // 预览
   var resetActionsColumn = (0, _ahooks.useMemoizedFn)(function (data, index, _actions, params) {
+    if (resetActions) {
+      return resetActions(data, index, actionList, params);
+    }
     var actions = _actions.filter(function (item) {
       return item.wanted !== 'update' && item.wanted !== 'add';
     });
@@ -319,9 +322,6 @@ var UploadGridForm = function UploadGridForm(_ref) {
         });
       }
     });
-    if (resetActions) {
-      return resetActions(data, index, actions, params);
-    }
     return actions;
   });
   var handleBatchOperationsClick = (0, _ahooks.useMemoizedFn)(function (key, selectedRows, cb) {
@@ -390,9 +390,19 @@ var UploadGridForm = function UploadGridForm(_ref) {
           beforeUpload: _beforeUpload
         });
       },
-      onChange: function onChange(e) {
-        handleUploadChange(e);
-        rest.onChange && rest.onChange(e);
+      customRequest: function customRequest(_ref2) {
+        var file = _ref2.file,
+          onProgress = _ref2.onProgress,
+          onSuccess = _ref2.onSuccess;
+        return new Promise(function (resolve) {
+          setTimeout(function () {
+            onProgress({
+              percent: 100
+            });
+            onSuccess(file);
+            resolve();
+          }, 1000);
+        });
       }
     })
   }), /*#__PURE__*/_react.default.createElement(_luckDesign.BasicFormItem, {

package/lib/upload/FormItem/index.js

@@ -11,20 +11,19 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireDefault(require("react"));
 var _luckDesign = require("luck-design");
 var _utils = require("@luck-design-biz/base/utils");
-var _apiUrl = require("../../lowcode/constants/api-url");
 var _excluded = ["uploadUrl", "moduleCode", "bucket", "tag", "note", "config", "supportTypes", "forbiddenTypes", "children", "dataFormat", "listType"];
 /**
  * 表单类型富文本上传
  * 是否实体字段： 是
  * 是否接受tag： 是
  * 是否虚拟主键： 否
- * 接受参数：
+ * 接受参数： 
  *    name: 附件名称逗号拼接
  *    name_virtual: [{...// 附件所有参数}]
  *    ### name=name_virtual ###
- * 传参：
+ * 传参： 
  *    name: [{objectName, marker},...]
- * 其他需求：
+ * 其他需求： 
  *  支持beforeUpload禁止附加类型
  *  =>beforeUpload禁止类型全覆盖
  *  =>forbiddenTypes和配置管理中禁止类型合并
@@ -42,13 +41,14 @@ function buildComponent(props) {
     _props$config = props.config,
     config = _props$config === void 0 ? {} : _props$config,
     supportTypes = props.supportTypes,
-    forbiddenTypes = props.forbiddenTypes,
+    _props$forbiddenTypes = props.forbiddenTypes,
+    forbiddenTypes = _props$forbiddenTypes === void 0 ? [] : _props$forbiddenTypes,
     children = props.children,
     dataFormat = props.dataFormat,
     listType = props.listType,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var getUrl = function getUrl(behaviorKey) {
-    return "".concat((0, _apiUrl.getBehaviorUrl)(), "?moduleCode=").concat(moduleCode, "&behaviorKey=").concat(behaviorKey, "&bucket=").concat(bucket, "&tag=").concat(tag, "&note=").concat(note);
+    return "".concat(window.appConfig.OSS_HOST_V3, "?moduleCode=").concat(moduleCode, "&behaviorKey=").concat(behaviorKey, "&bucket=").concat(bucket, "&tag=").concat(tag, "&note=").concat(note);
   };
   var supportUploadTypes = (0, _utils.getSupportUploadTypes)(forbiddenTypes, supportTypes);
   return /*#__PURE__*/_react.default.createElement(_luckDesign.BasicFormItem, (0, _extends2.default)({

package/lib/utils/form.js

@@ -39,7 +39,7 @@ function getFormItem() {
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   if (!property) return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
-  if (property === 'sint' || property === 'number') props.opt_decimal = 0;
+  if (property === 'sint' || property === 'number' || property === 'long') props.opt_decimal = 0;
   var comType = comName || _form.defaultComName[property];
   var _translator = (0, _form.translator)(props),
     name = _translator.name,
@@ -73,7 +73,7 @@ function getFormItem() {
 var formItemDataFormat = exports.formItemDataFormat = function formItemDataFormat() {
   var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var omitValues = {};
+  var omitValues = (0, _lodash.cloneDeep)(values);
   var data = (0, _lodash.transform)(propsList, function (result, n) {
     var _ref2 = n || {},
       comName = _ref2.comName,
@@ -133,7 +133,7 @@ var formItemDataFormat = exports.formItemDataFormat = function formItemDataForma
       default:
         if (!(0, _lodash.isNil)(values["".concat(name, "_virtual")] || values[name])) result[name] = values["".concat(name, "_virtual")] || values[name];
     }
-    omitValues = (0, _lodash.omit)(values, [name, "".concat(name, "_virtual")]);
+    omitValues = (0, _lodash.omit)(omitValues, [name, "".concat(name, "_virtual")]);
   }, {});
   return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, omitValues), data);
 };

package/lib/utils/grid.js

@@ -46,13 +46,14 @@ function getColumnRender(name, type) {
       break;
     case 'year':
       render = function render(text) {
-        return text;
+        return _moment.default.isMoment(text) ? text.format('YYYY') : text;
       };
       break;
     case 'user':
     case 'select':
     case 'group':
     case 'complex':
+    case 'dict':
       render = function render(text, record) {
         if (record["".concat(name, "_virtual")]) return record["".concat(name, "_virtual")];
         if ((0, _lodash.isArray)(text)) return text.map(function (i) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "1.0.0-alpha",
+  "version": "1.0.1",
   "description": "前端配置管理中心业务组件库",
   "scripts": {
     "start": "cross-env NODE_OPTIONS=--max-old-space-size=10240 USER_RUNTIME=SITE RUNTIME=dev umi dev",
@@ -81,7 +81,7 @@
     "@babel/plugin-transform-strict-mode": "^7.18.6",
     "@babel/polyfill": "^7.12.1",
     "@babel/traverse": "^7.24.1",
-    "@luck-design-biz/base": "0.0.47-9",
+    "@luck-design-biz/base": "0.0.49",
     "@luck-design-biz/bpm": "0.0.5",
     "@luck-helper/ui-design": "0.0.6",
     "@types/classnames": "^2.3.1",
@@ -126,7 +126,7 @@
     "js-cookie": "^2.2.1",
     "jsdom-global": "^3.0.2",
     "lint-staged": "^11.2.6",
-    "luck-design": "0.1.78-8",
+    "luck-design": "0.1.80",
     "monaco-editor-webpack-plugin": "6.*.*",
     "node-fetch": "^2.6.7",
     "nprogress": "^0.2.0",