@luck-design-biz/luckda 0.0.9 → 0.0.10

package/es/components/LdFormList/index.js

@@ -122,25 +122,30 @@ var LdFormList = function LdFormList(_ref) {
         } else {
           var _formListRef$current;
           props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
-          if (!formWindow && formMode === 'add' && window.__INJECTED_FLOAT_MICRO_APP_BY_QIANKUN) {
-            var _history$location = history.location,
-              pathname = _history$location.pathname,
-              query = _history$location.query;
-            var _pathname = pathname.replace(/\/0(?=[?]|[\/]$|$)/g, "/".concat(indocno, "?"));
-            window.openUrl("layer:".concat(_pathname).concat(stringify(_objectSpread(_objectSpread({}, query), {}, {
-              title: window.__INJECTED_APP_NAME_BY_QIANKUN__
-            }))));
-          } else {
-            formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, {
-              indocno: indocno
-            }), function () {
-              return formListRef.current.setFormMode('info');
-            });
-          }
+          // if (
+          //   !formWindow &&
+          //   formMode === 'add' &&
+          //   window.__INJECTED_FLOAT_MICRO_APP_BY_QIANKUN
+          // ) {
+          //   const { pathname, query } = history.location;
+          //   window.openUrl(
+          //     `layer:${pathname}?${stringify({
+          //       ...query,
+          //       title: window.__INJECTED_APP_NAME_BY_QIANKUN__,
+          //     })}`,
+          //   );
+          // } else {
+          formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, {
+            indocno: indocno
+          }), function () {
+            return formListRef.current.setFormMode('info');
+          });
+          // }
         }
       }
     });
   };
+
   var formConfig = _objectSpread(_objectSpread({
     formState: formState,
     formMode: formMode,

package/es/helper/FromItems.js

@@ -21,7 +21,9 @@ var _excluded = ["onBlur"],
   _excluded17 = ["onChange"],
   _excluded18 = ["handleValueChange", "config"],
   _excluded19 = ["handleValueChange"],
-  _excluded20 = ["handleValueChange", "config"];
+  _excluded20 = ["handleValueChange", "config"],
+  _excluded21 = ["onBlur"],
+  _excluded22 = ["handleValueChange", "config"];
 import React, { useState, useEffect } from 'react';
 import { getDvaApp } from 'umi';
 import { BasicFormItem } from 'luck-design';
@@ -264,4 +266,27 @@ export var getYearItem = function getYearItem() {
       }
     })
   }));
+};
+export var getEditorItem = function getEditorItem() {
+  var _ref13 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+    handleValueChange = _ref13.handleValueChange,
+    _ref13$config = _ref13.config;
+  _ref13$config = _ref13$config === void 0 ? {} : _ref13$config;
+  var _onBlur4 = _ref13$config.onBlur,
+    _config = _objectWithoutProperties(_ref13$config, _excluded21),
+    props = _objectWithoutProperties(_ref13, _excluded22);
+  return /*#__PURE__*/React.createElement(BasicFormItem, _extends({}, props, {
+    type: "editor",
+    config: _objectSpread(_objectSpread({
+      language: 'zh-cn',
+      headers: {
+        Authorization: "Bearer "
+      }
+    }, _config), {}, {
+      onBlur: function onBlur(value) {
+        handleValueChange && handleValueChange(value);
+        _onBlur4 && _onBlur4(value);
+      }
+    })
+  }));
 };

package/es/helper/action.js

@@ -21,9 +21,7 @@ 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,
-    form_id = _ref.form_id,
-    effcode = _ref.effcode;
+    showPopWhenSuccess = _ref$showPopWhenSucce === void 0 ? true : _ref$showPopWhenSucce;
   var _ref2 = arguments.length > 3 ? arguments[3] : undefined,
     _ref2$actions = _ref2.actions,
     actions = _ref2$actions === void 0 ? {} : _ref2$actions,
@@ -45,16 +43,20 @@ export var doAction = function doAction(action) {
         onOk: onOk
       });
     };
+    var get = data.get,
+      post = data.post;
+    if (!get && !post) {
+      get = {};
+      post = data;
+    }
     var handleAction = function handleAction() {
-      behaviorCall({
+      behaviorCall(_objectSpread({
         behaviorKey: action,
-        moduleCode: moduleCode,
-        form_id: form_id,
-        effcode: effcode
-      }, data).then(function (res) {
+        moduleCode: moduleCode
+      }, get), post).then(function (res) {
         var code = res.code,
-          data = res.data;
-        callback && callback(code === 1, data, res);
+          _data = res.data;
+        callback && callback(code === 1, _data, res);
         if (code === 1 && showPopWhenSuccess) {
           showPop(formatMessage({
             id: 'app.base.tip.operate.success'
@@ -127,11 +129,15 @@ export var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
   }, {});
   beforeSubmit(data, values).then(function (backData) {
     if (backData) {
-      doAction(action, backData, {
+      doAction(action, {
+        get: {
+          form_id: form_id,
+          effcode: effcode
+        },
+        post: backData
+      }, {
         showConfirm: false,
-        callback: callback,
-        form_id: form_id,
-        effcode: effcode
+        callback: callback
       });
     }
   });

package/es/helper/form.js

@@ -19,7 +19,8 @@ export var defaultComName = {
   code: 'string',
   color: 'color',
   zone: 'region',
-  year: 'year'
+  year: 'year',
+  rte: 'editor'
 };
 
 /**

package/lib/components/LdFormList/index.js

@@ -129,25 +129,30 @@ var LdFormList = function LdFormList(_ref) {
         } else {
           var _formListRef$current;
           props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
-          if (!formWindow && formMode === 'add' && window.__INJECTED_FLOAT_MICRO_APP_BY_QIANKUN) {
-            var _history$location = _umi.history.location,
-              pathname = _history$location.pathname,
-              query = _history$location.query;
-            var _pathname = pathname.replace(/\/0(?=[?]|[\/]$|$)/g, "/".concat(indocno, "?"));
-            window.openUrl("layer:".concat(_pathname).concat((0, _querystring.stringify)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, query), {}, {
-              title: window.__INJECTED_APP_NAME_BY_QIANKUN__
-            }))));
-          } else {
-            formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, {
-              indocno: indocno
-            }), function () {
-              return formListRef.current.setFormMode('info');
-            });
-          }
+          // if (
+          //   !formWindow &&
+          //   formMode === 'add' &&
+          //   window.__INJECTED_FLOAT_MICRO_APP_BY_QIANKUN
+          // ) {
+          //   const { pathname, query } = history.location;
+          //   window.openUrl(
+          //     `layer:${pathname}?${stringify({
+          //       ...query,
+          //       title: window.__INJECTED_APP_NAME_BY_QIANKUN__,
+          //     })}`,
+          //   );
+          // } else {
+          formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, {
+            indocno: indocno
+          }), function () {
+            return formListRef.current.setFormMode('info');
+          });
+          // }
         }
       }
     });
   };
+
   var formConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({
     formState: formState,
     formMode: formMode,

package/lib/helper/FromItems.js

@@ -5,7 +5,7 @@ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWild
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getYearItem = exports.getUserItem = exports.getTextareaItem = exports.getSwitchItem = exports.getStringItem = exports.getSelectItem = exports.getRegionItem = exports.getRadioItem = exports.getNumberItem = exports.getGroupItem = exports.getDateItem = exports.getColorItem = void 0;
+exports.getYearItem = exports.getUserItem = exports.getTextareaItem = exports.getSwitchItem = exports.getStringItem = exports.getSelectItem = exports.getRegionItem = exports.getRadioItem = exports.getNumberItem = exports.getGroupItem = exports.getEditorItem = exports.getDateItem = exports.getColorItem = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -34,7 +34,9 @@ var _excluded = ["onBlur"],
   _excluded17 = ["onChange"],
   _excluded18 = ["handleValueChange", "config"],
   _excluded19 = ["handleValueChange"],
-  _excluded20 = ["handleValueChange", "config"];
+  _excluded20 = ["handleValueChange", "config"],
+  _excluded21 = ["onBlur"],
+  _excluded22 = ["handleValueChange", "config"];
 var getNumberItem = function getNumberItem() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     handleValueChange = _ref.handleValueChange,
@@ -284,4 +286,28 @@ var getYearItem = function getYearItem() {
     })
   }));
 };
-exports.getYearItem = getYearItem;
+exports.getYearItem = getYearItem;
+var getEditorItem = function getEditorItem() {
+  var _ref13 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+    handleValueChange = _ref13.handleValueChange,
+    _ref13$config = _ref13.config;
+  _ref13$config = _ref13$config === void 0 ? {} : _ref13$config;
+  var _onBlur4 = _ref13$config.onBlur,
+    _config = (0, _objectWithoutProperties2.default)(_ref13$config, _excluded21),
+    props = (0, _objectWithoutProperties2.default)(_ref13, _excluded22);
+  return /*#__PURE__*/_react.default.createElement(_luckDesign.BasicFormItem, (0, _extends2.default)({}, props, {
+    type: "editor",
+    config: (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      language: 'zh-cn',
+      headers: {
+        Authorization: "Bearer "
+      }
+    }, _config), {}, {
+      onBlur: function onBlur(value) {
+        handleValueChange && handleValueChange(value);
+        _onBlur4 && _onBlur4(value);
+      }
+    })
+  }));
+};
+exports.getEditorItem = getEditorItem;

package/lib/helper/action.js

@@ -28,9 +28,7 @@ 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,
-    form_id = _ref.form_id,
-    effcode = _ref.effcode;
+    showPopWhenSuccess = _ref$showPopWhenSucce === void 0 ? true : _ref$showPopWhenSucce;
   var _ref2 = arguments.length > 3 ? arguments[3] : undefined,
     _ref2$actions = _ref2.actions,
     actions = _ref2$actions === void 0 ? {} : _ref2$actions,
@@ -52,16 +50,20 @@ var doAction = function doAction(action) {
         onOk: onOk
       });
     };
+    var get = data.get,
+      post = data.post;
+    if (!get && !post) {
+      get = {};
+      post = data;
+    }
     var handleAction = function handleAction() {
-      (0, _utils2.behaviorCall)({
+      (0, _utils2.behaviorCall)((0, _objectSpread2.default)({
         behaviorKey: action,
-        moduleCode: moduleCode,
-        form_id: form_id,
-        effcode: effcode
-      }, data).then(function (res) {
+        moduleCode: moduleCode
+      }, get), post).then(function (res) {
         var code = res.code,
-          data = res.data;
-        callback && callback(code === 1, data, res);
+          _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'
@@ -135,11 +137,15 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
   }, {});
   beforeSubmit(data, values).then(function (backData) {
     if (backData) {
-      doAction(action, backData, {
+      doAction(action, {
+        get: {
+          form_id: form_id,
+          effcode: effcode
+        },
+        post: backData
+      }, {
         showConfirm: false,
-        callback: callback,
-        form_id: form_id,
-        effcode: effcode
+        callback: callback
       });
     }
   });

package/lib/helper/form.js

@@ -28,7 +28,8 @@ var defaultComName = {
   code: 'string',
   color: 'color',
   zone: 'region',
-  year: 'year'
+  year: 'year',
+  rte: 'editor'
 };
 
 /**

package/package.json

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