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

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

@@ -1,11 +1,12 @@
-import React, { useRef } from 'react';
+import React, { useRef, useEffect } from 'react';
 import { useMemoizedFn, useCreation } from 'ahooks';
 import styled from 'styled-components';
 import { sum } from 'lodash';
 import { MemorySplit } from '@luck-design-biz/base';
+import { useContext } from "../../../engine/provider/ContextProvider";
+import Wrapper from "../Wrapper";
 import { omitBadProps } from "../../../engine/tools/helper";
 import defaultMeta from "../../../engine/meta/split.props.default.json";
-import Wrapper from "../Wrapper";
 var _MAPPING_ = {
   left: 'min',
   up: 'min',
@@ -22,8 +23,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 = useRef();
+  var ctx = useContext();
+  useEffect(function () {
+    ctx.doAction(advance.events.onMount);
+    return function () {
+      return ctx.doAction(advance.events.onUnmount);
+    };
+  }, []);
   var getTargetDom = useMemoizedFn(function () {
     return ref.current;
   });
@@ -38,6 +47,11 @@ var LCSplit = function LCSplit(_ref) {
     }, [display.ratio]),
     ratioArr = _useCreation.ratioArr,
     total = _useCreation.total;
+  var handleChange = useMemoizedFn(function (value) {
+    ctx.doAction(advance.events.onChange, {
+      value: value
+    });
+  });
   return /*#__PURE__*/React.createElement(Wrapper, {
     id: id,
     displayName: "Split",
@@ -46,7 +60,8 @@ var LCSplit = function LCSplit(_ref) {
     ref: ref,
     $css: css
   }, /*#__PURE__*/React.createElement(MemorySplit, {
-    split: display.split
+    split: display.split,
+    onChange: handleChange
   }, ratioArr.map(function (r, i) {
     return /*#__PURE__*/React.createElement(MemorySplit.Pane, {
       fastTo: !display.fastTo || i === display.fastTo.length ? 'max' : _MAPPING_[display.fastTo[i]],

package/es/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/es/lowcode/view/lc-components/Table/index.js

@@ -1,8 +1,10 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+var _excluded = ["render"];
 import React, { useRef, useImperativeHandle, forwardRef, useCallback } from 'react';
 import PropTypes from 'prop-types';
 import { useMemoizedFn, useCreation, useRequest, useUnmount } from 'ahooks';
@@ -14,6 +16,7 @@ import Wrapper from "../Wrapper";
 import { LdGrid, LDActions } from "../../../../index";
 import TopFilter from "./components/TopFilter";
 import { TopUpload, TopExport } from "./components/TopImex";
+import RuntimeComp from "../JSX/RuntimeComp";
 import { omitBadProps, executeCode, getLDMetaAttr } from "../../../engine/tools/helper";
 import useCombinedRefs from "../../../engine/tools/useCombinedRefs";
 import defaultMeta from "../../../engine/meta/table.props.default.json";
@@ -71,6 +74,18 @@ var LCTable = /*#__PURE__*/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);
       }
     };
   });
@@ -368,8 +383,19 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
     if (!isNil(columnsRewrite) || !isNil(fields)) {
       temp.columnsRewrite = function (cols) {
         var colsMap = keyBy(cols, 'field');
-        var _cols = isNil(fields) ? cols : fields.map(function (_field) {
-          return _objectSpread(_objectSpread({}, colsMap[_field.field]), _field);
+        var _cols = isNil(fields) ? cols : fields.map(function (_ref4) {
+          var render = _ref4.render,
+            _field = _objectWithoutProperties(_ref4, _excluded);
+          return _objectSpread(_objectSpread({}, colsMap[_field.field]), {}, {
+            render: render ? function (v, d, i, p) {
+              return /*#__PURE__*/React.createElement(RuntimeComp, {
+                value: v,
+                data: d,
+                rowIndex: i,
+                params: p
+              }, render.replace(/(function\s*\w*\s*)\([^)]*\)(\s*{)/, '$1()$2'));
+            } : null
+          }, _field);
         });
         return isNil(columnsRewrite) ? _cols : executeCode(ctx, columnsRewrite, ['columns'], _cols);
       };
@@ -512,7 +538,7 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
     });
   });
   var _afterQuery = 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/es/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/es/lowcode/view/lc-components/Tabs/index.js

@@ -1,8 +1,9 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useRef, useState, useImperativeHandle } from 'react';
+import React, { useRef, useState, useImperativeHandle, useEffect } from 'react';
 import { findDOMNode } from 'react-dom';
 import PropTypes from 'prop-types';
-import { useMemoizedFn, useMount, useUnmount } from 'ahooks';
+import { useMemoizedFn, useCreation } from 'ahooks';
+import { isNil } from 'lodash';
 import styled from 'styled-components';
 import { Tabs } from 'luck-design/antd';
 import { useContext } from "../../../engine/provider/ContextProvider";
@@ -31,25 +32,27 @@ var LCTabs = function LCTabs(_ref) {
   var ref = useRef();
   var apiRef = useRef();
   var ctx = useContext();
+  var _items = useCreation(function () {
+    return items.filter(function (_ref2) {
+      var serial = _ref2.serial;
+      return isNil(serial) || ctx.want(serial);
+    });
+  }, [items]);
   var _useState = 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 = _slicedToArray(_useState, 2),
     activeKey = _useState2[0],
     setActiveKey = _useState2[1];
-  useMount(function () {
-    ctx.doAction(advance.events.onMount, {
-      instance: ref.current
-    });
-  });
-  useUnmount(function () {
-    ctx.doAction(advance.events.onUnmount, {
-      instance: ref.current
-    });
-  });
+  useEffect(function () {
+    ctx.doAction(advance.events.onMount);
+    return function () {
+      ctx.doAction(advance.events.onUnmount);
+    };
+  }, []);
   var handleTabClick = useMemoizedFn(function (tabKey, e) {
     setActiveKey(tabKey);
     ctx.doAction(advance.events.onTabClick, {
@@ -81,7 +84,7 @@ var LCTabs = function LCTabs(_ref) {
     tabBarExtraContent: tabBarExtraContent ? /*#__PURE__*/React.createElement(RuntimeComp, null, tabBarExtraContent) : null,
     $css: css,
     onTabClick: handleTabClick
-  }, items.map(function (item) {
+  }, _items.map(function (item) {
     return /*#__PURE__*/React.createElement(Tabs.TabPane, {
       tab: item.name,
       key: item.id,

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

@@ -1,8 +1,9 @@
 import React, { useRef } from 'react';
-import { useMemoizedFn, useMount, useUnmount } from 'ahooks';
+import { useMemoizedFn, useCreation, useMount, useUnmount } from 'ahooks';
 import styled from 'styled-components';
 import Wrapper from "../Wrapper";
 import { useContext } from "../../../engine/provider/ContextProvider";
+import RuntimeCom from "../JSX/RuntimeComp";
 import { omitBadProps } from "../../../engine/tools/helper";
 import defaultMeta from "../../../engine/meta/text.props.default.json";
 var StyledText = styled.div.withConfig({
@@ -36,6 +37,12 @@ var LCText = function LCText(_ref) {
       e: e
     });
   });
+  var _content = useCreation(function () {
+    if (content.code) {
+      return /*#__PURE__*/React.createElement(RuntimeCom, null, content.code);
+    }
+    return content.text;
+  }, [content]);
   var getTargetDom = useMemoizedFn(function () {
     return ref.current;
   });
@@ -48,7 +55,7 @@ var LCText = function LCText(_ref) {
     $css: css,
     $max: maxLine,
     onClick: handleClick
-  }, content));
+  }, _content));
 };
 LCText.defaultProps = omitBadProps(defaultMeta);
 export default LCText;

package/es/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/es/lowcode/view/lc-components/Wrapper.js

@@ -1,8 +1,9 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import React, { useEffect } from 'react';
 import { useLatest, useCreation } from 'ahooks';
 import { omit } from 'lodash';
-import { useContext, useGet, getLevelNodes as _getLevelNodes, getSelfAndParent } from "../../engine/provider/ContextProvider";
+import { useContext, useGet, modifyNode, getLevelNodes as _getLevelNodes, getSelfAndParent } from "../../engine/provider/ContextProvider";
 import { LC_COMPONENT_UNIT_KEY, LC_COMPONENT_UNIT, RUNTIME } from "../../constants";
 import DragDropWrapper from "../../painter/components/DragDrop/DragDropWrapper";
 var LCWrapper = function LCWrapper(_ref) {
@@ -33,7 +34,21 @@ var LCWrapper = function LCWrapper(_ref) {
     };
     ctx._register(id, new Proxy({
       id: id,
-      meta: omit(meta, ['props', 'css', 'advance'])
+      meta: omit(meta, ['props', 'css', 'advance']),
+      set: function set(prop, value, toDom) {
+        if (toDom === true) {
+          if (['id', LC_COMPONENT_UNIT_KEY].includes(prop)) {
+            return;
+          }
+          var dom = getTargetDom();
+          dom.setAttribute(prop, value);
+          return;
+        }
+        modifyNode(id, _defineProperty({}, prop, value));
+      },
+      get: function get(prop) {
+        return _selfData.current.props[prop];
+      }
     }, {
       get: function get(target, property, receiver) {
         if (property === 'api') {

package/es/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/es/services.js

@@ -20,4 +20,23 @@ function _readModlue() {
     }, _callee);
   }));
   return _readModlue.apply(this, arguments);
+}
+export function noAuthTransformCode(_x2) {
+  return _noAuthTransformCode.apply(this, arguments);
+}
+function _noAuthTransformCode() {
+  _noAuthTransformCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          return _context2.abrupt("return", request("".concat(api.BASE_HOST, "/page/option/noAuthTransformCode"), {
+            params: params
+          }));
+        case 1:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _noAuthTransformCode.apply(this, arguments);
 }

package/es/upload/Form/gridForm.js

@@ -79,7 +79,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
   var _getDvaApp$_store$get = (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store.getState().user,
     currentUser = _getDvaApp$_store$get.currentUser;
   var supportUploadTypes = useCreation(function () {
-    return getSupportUploadTypes(forbiddenTypes);
+    return getSupportUploadTypes(forbiddenTypes, supportTypes);
   }, [forbiddenTypes, supportTypes]);
 
   // 下载
@@ -271,6 +271,9 @@ var UploadGridForm = function UploadGridForm(_ref) {
 
   // 预览
   var resetActionsColumn = 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';
     });
@@ -311,9 +314,6 @@ var UploadGridForm = function UploadGridForm(_ref) {
         });
       }
     });
-    if (resetActions) {
-      return resetActions(data, index, actions, params);
-    }
     return actions;
   });
   var handleBatchOperationsClick = useMemoizedFn(function (key, selectedRows, cb) {
@@ -382,9 +382,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.createElement(BasicFormItem, {

package/es/upload/FormItem/index.js

@@ -5,20 +5,19 @@ var _excluded = ["uploadUrl", "moduleCode", "bucket", "tag", "note", "config", "
 import React from 'react';
 import { BasicFormItem } from 'luck-design';
 import { formatMessage, beforeUpload as _beforeUpload, getSupportUploadTypes } from '@luck-design-biz/base/utils';
-import { getBehaviorUrl } from "../../lowcode/constants/api-url";
 
 /**
  * 表单类型富文本上传
  * 是否实体字段： 是
  * 是否接受tag： 是
  * 是否虚拟主键： 否
- * 接受参数：
+ * 接受参数： 
  *    name: 附件名称逗号拼接
  *    name_virtual: [{...// 附件所有参数}]
  *    ### name=name_virtual ###
- * 传参：
+ * 传参： 
  *    name: [{objectName, marker},...]
- * 其他需求：
+ * 其他需求： 
  *  支持beforeUpload禁止附加类型
  *  =>beforeUpload禁止类型全覆盖
  *  =>forbiddenTypes和配置管理中禁止类型合并
@@ -36,13 +35,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 = _objectWithoutProperties(props, _excluded);
   var getUrl = function getUrl(behaviorKey) {
-    return "".concat(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 = getSupportUploadTypes(forbiddenTypes, supportTypes);
   return /*#__PURE__*/React.createElement(BasicFormItem, _extends({

package/es/utils/form.js

@@ -12,7 +12,7 @@ var _excluded = ["comName", "property"],
   _excluded9 = ["type", "name"];
 import React from 'react';
 import moment from 'moment';
-import { capitalize, merge, transform, isArray, omit, isNil, clone } from 'lodash';
+import { capitalize, merge, transform, isArray, omit, isNil, clone, cloneDeep } from 'lodash';
 import api from "@/services/ApiConfig";
 import { defaultComName, translator, splitStrToObj, formatCustomProps } from "../helper/form";
 import { getColumnRender } from "./grid";
@@ -31,7 +31,7 @@ export function getFormItem() {
     props = _objectWithoutProperties(_ref, _excluded);
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   if (!property) return /*#__PURE__*/React.createElement(React.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 || defaultComName[property];
   var _translator = translator(props),
     name = _translator.name,
@@ -65,7 +65,7 @@ export function getFormItem() {
 export var 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 = cloneDeep(values);
   var data = transform(propsList, function (result, n) {
     var _ref2 = n || {},
       comName = _ref2.comName,
@@ -125,7 +125,7 @@ export var formItemDataFormat = function formItemDataFormat() {
       default:
         if (!isNil(values["".concat(name, "_virtual")] || values[name])) result[name] = values["".concat(name, "_virtual")] || values[name];
     }
-    omitValues = omit(values, [name, "".concat(name, "_virtual")]);
+    omitValues = omit(omitValues, [name, "".concat(name, "_virtual")]);
   }, {});
   return _objectSpread(_objectSpread({}, omitValues), data);
 };

package/es/utils/grid.js

@@ -38,13 +38,14 @@ export function getColumnRender(name, type) {
       break;
     case 'year':
       render = function render(text) {
-        return text;
+        return moment.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 (isArray(text)) return text.map(function (i) {

package/lib/components/Builder/index.js

@@ -13,10 +13,12 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
 var _luckDesign = require("luck-design");
+var _utils = require("@luck-design-biz/base/utils");
+var _constants = require("../../lowcode/constants");
+var _helper = require("../../lowcode/engine/tools/helper");
 var _LdPop = _interopRequireDefault(require("../LdPop"));
 var _services = require("../../services");
 var _action2 = require("../../helper/action");
-var _utils = require("@luck-design-biz/base/utils");
 var LuckDaContext = exports.LuckDaContext = /*#__PURE__*/(0, _react.createContext)();
 var useLDCtx = exports.useLDCtx = function useLDCtx() {
   return (0, _react.useContext)(LuckDaContext);
@@ -36,6 +38,16 @@ var builder = function builder(WrappedComponent, moduleCode) {
       pops = _useSetState2[0],
       setPops = _useSetState2[1];
     var fieldProps = (0, _react.useRef)({});
+    (0, _react.useEffect)(function () {
+      (0, _helper.setMetaAttrs)(_constants.LC_RUNTIME_KEY, 'live');
+      (0, _services.noAuthTransformCode)({
+        code: moduleCode
+      }).then(function (res) {
+        var code = res.code,
+          data = res.data;
+        if (code === 1) (0, _helper.setMetaAttrs)(_constants.META_TAG_NAME, data);
+      });
+    }, []);
     var _useRequest = (0, _ahooks.useRequest)(_services.readModlue, {
         defaultParams: [{
           moduleCode: moduleCode