@kmkf-fe-packages/basic-components 2.2.5-beta.4 → 2.2.5-beta.6

package/dist/index.esm.js

@@ -8204,6 +8204,11 @@ var CheckboxRender = function CheckboxRender(_ref4) {
   }
   return value === null || value === void 0 ? void 0 : (_value$value4 = value.value) === null || _value$value4 === void 0 ? void 0 : _value$value4.join('/');
 };
+var MultipleSelectRender = function MultipleSelectRender(_ref5) {
+  var _ref5$value = _ref5.value,
+    value = _ref5$value === void 0 ? [] : _ref5$value;
+  return value === null || value === void 0 ? void 0 : value.join(',');
+};
 var renderMap = {
   PICTURE: function PICTURE() {
     var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -8230,16 +8235,21 @@ var renderMap = {
     return /*#__PURE__*/React.createElement(CheckboxRender, {
       value: value
     });
+  },
+  BASIC_MULT_SELECT: function BASIC_MULT_SELECT(value) {
+    return /*#__PURE__*/React.createElement(MultipleSelectRender, {
+      value: value
+    });
   }
 };
-var EditPictureRender = function EditPictureRender(_ref5) {
-  var _ref5$val = _ref5.val,
-    val = _ref5$val === void 0 ? [] : _ref5$val,
-    index = _ref5.index,
-    t = _ref5.t,
-    updateHandle = _ref5.updateHandle,
-    disabled = _ref5.disabled,
-    hostUrl = _ref5.hostUrl;
+var EditPictureRender = function EditPictureRender(_ref6) {
+  var _ref6$val = _ref6.val,
+    val = _ref6$val === void 0 ? [] : _ref6$val,
+    index = _ref6.index,
+    t = _ref6.t,
+    updateHandle = _ref6.updateHandle,
+    disabled = _ref6.disabled,
+    hostUrl = _ref6.hostUrl;
   var finalPictures = val.map(function (item) {
     return item.startsWith('http') ? item : "".concat(hostUrl, "/").concat(item);
   });
@@ -8274,14 +8284,14 @@ var EditPictureRender = function EditPictureRender(_ref5) {
     hostUrl: hostUrl
   }));
 };
-var EditFileRender = function EditFileRender(_ref6) {
-  var _ref6$val = _ref6.val,
-    val = _ref6$val === void 0 ? [] : _ref6$val,
-    index = _ref6.index,
-    t = _ref6.t,
-    updateHandle = _ref6.updateHandle,
-    disabled = _ref6.disabled,
-    hostUrl = _ref6.hostUrl;
+var EditFileRender = function EditFileRender(_ref7) {
+  var _ref7$val = _ref7.val,
+    val = _ref7$val === void 0 ? [] : _ref7$val,
+    index = _ref7.index,
+    t = _ref7.t,
+    updateHandle = _ref7.updateHandle,
+    disabled = _ref7.disabled,
+    hostUrl = _ref7.hostUrl;
   return /*#__PURE__*/React.createElement("div", {
     style: {
       display: 'flex',
@@ -8313,13 +8323,13 @@ var EditFileRender = function EditFileRender(_ref6) {
   }));
 };
 var EditRenderMap = {
-  INPUT: function INPUT(_ref7) {
-    var val = _ref7.val,
-      record = _ref7.record,
-      index = _ref7.index,
-      t = _ref7.t,
-      updateHandle = _ref7.updateHandle,
-      disabled = _ref7.disabled;
+  INPUT: function INPUT(_ref8) {
+    var val = _ref8.val,
+      record = _ref8.record,
+      index = _ref8.index,
+      t = _ref8.t,
+      updateHandle = _ref8.updateHandle,
+      disabled = _ref8.disabled;
     var precisionValue = t.precision === 'nolimit' ? undefined : t.precision;
     return !t.isEdit && !disabled ? t.isNumber ? /*#__PURE__*/React.createElement(InputNumber, {
       style: {
@@ -8342,13 +8352,13 @@ var EditRenderMap = {
       }
     }) : /*#__PURE__*/React.createElement("div", null, val);
   },
-  TEXTAREA: function TEXTAREA(_ref8) {
-    var val = _ref8.val,
-      record = _ref8.record,
-      index = _ref8.index,
-      t = _ref8.t,
-      updateHandle = _ref8.updateHandle,
-      disabled = _ref8.disabled;
+  TEXTAREA: function TEXTAREA(_ref9) {
+    var val = _ref9.val,
+      record = _ref9.record,
+      index = _ref9.index,
+      t = _ref9.t,
+      updateHandle = _ref9.updateHandle,
+      disabled = _ref9.disabled;
     var precisionValue = t.precision === 'nolimit' ? undefined : t.precision;
     return !t.isEdit && !disabled ? t.isNumber ? /*#__PURE__*/React.createElement(InputNumber, {
       style: {
@@ -8371,13 +8381,13 @@ var EditRenderMap = {
       }
     }) : /*#__PURE__*/React.createElement("div", null, val);
   },
-  PICTURE: function PICTURE(_ref9) {
-    var val = _ref9.val,
-      record = _ref9.record,
-      index = _ref9.index,
-      t = _ref9.t,
-      updateHandle = _ref9.updateHandle,
-      disabled = _ref9.disabled;
+  PICTURE: function PICTURE(_ref10) {
+    var val = _ref10.val,
+      record = _ref10.record,
+      index = _ref10.index,
+      t = _ref10.t,
+      updateHandle = _ref10.updateHandle,
+      disabled = _ref10.disabled;
     return !t.isEdit && !disabled ? /*#__PURE__*/React.createElement(EditPictureRender, {
       val: val,
       t: t,
@@ -8391,13 +8401,13 @@ var EditRenderMap = {
       hostUrl: hostUrl
     });
   },
-  FILE: function FILE(_ref10) {
-    var val = _ref10.val,
-      record = _ref10.record,
-      index = _ref10.index,
-      t = _ref10.t,
-      updateHandle = _ref10.updateHandle,
-      disabled = _ref10.disabled;
+  FILE: function FILE(_ref11) {
+    var val = _ref11.val,
+      record = _ref11.record,
+      index = _ref11.index,
+      t = _ref11.t,
+      updateHandle = _ref11.updateHandle,
+      disabled = _ref11.disabled;
     return !t.isEdit && !disabled ? /*#__PURE__*/React.createElement(EditFileRender, {
       val: val,
       t: t,
@@ -8410,23 +8420,7 @@ var EditRenderMap = {
       canDownload: true
     });
   },
-  RADIO: function RADIO(_ref11) {
-    var val = _ref11.val,
-      record = _ref11.record,
-      index = _ref11.index,
-      t = _ref11.t,
-      updateHandle = _ref11.updateHandle,
-      disabled = _ref11.disabled,
-      componentDto = _ref11.componentDto;
-    return /*#__PURE__*/React.createElement(ApaasRadio, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
-      value: val,
-      disabled: t.isEdit || disabled,
-      onChange: function onChange(e) {
-        return updateHandle(e, index, t.key);
-      }
-    }));
-  },
-  SELECT: function SELECT(_ref12) {
+  RADIO: function RADIO(_ref12) {
     var val = _ref12.val,
       record = _ref12.record,
       index = _ref12.index,
@@ -8434,7 +8428,7 @@ var EditRenderMap = {
       updateHandle = _ref12.updateHandle,
       disabled = _ref12.disabled,
       componentDto = _ref12.componentDto;
-    return /*#__PURE__*/React.createElement(ApaasSelect, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
+    return /*#__PURE__*/React.createElement(ApaasRadio, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
       value: val,
       disabled: t.isEdit || disabled,
       onChange: function onChange(e) {
@@ -8442,7 +8436,7 @@ var EditRenderMap = {
       }
     }));
   },
-  CHECKBOX: function CHECKBOX(_ref13) {
+  SELECT: function SELECT(_ref13) {
     var val = _ref13.val,
       record = _ref13.record,
       index = _ref13.index,
@@ -8450,7 +8444,7 @@ var EditRenderMap = {
       updateHandle = _ref13.updateHandle,
       disabled = _ref13.disabled,
       componentDto = _ref13.componentDto;
-    return /*#__PURE__*/React.createElement(ApaasCheckbox, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
+    return /*#__PURE__*/React.createElement(ApaasSelect, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
       value: val,
       disabled: t.isEdit || disabled,
       onChange: function onChange(e) {
@@ -8458,7 +8452,7 @@ var EditRenderMap = {
       }
     }));
   },
-  BASIC_MULT_SELECT: function BASIC_MULT_SELECT(_ref14) {
+  CHECKBOX: function CHECKBOX(_ref14) {
     var val = _ref14.val,
       record = _ref14.record,
       index = _ref14.index,
@@ -8466,6 +8460,22 @@ var EditRenderMap = {
       updateHandle = _ref14.updateHandle,
       disabled = _ref14.disabled,
       componentDto = _ref14.componentDto;
+    return /*#__PURE__*/React.createElement(ApaasCheckbox, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
+      value: val,
+      disabled: t.isEdit || disabled,
+      onChange: function onChange(e) {
+        return updateHandle(e, index, t.key);
+      }
+    }));
+  },
+  BASIC_MULT_SELECT: function BASIC_MULT_SELECT(_ref15) {
+    var val = _ref15.val,
+      record = _ref15.record,
+      index = _ref15.index,
+      t = _ref15.t,
+      updateHandle = _ref15.updateHandle,
+      disabled = _ref15.disabled,
+      componentDto = _ref15.componentDto;
     return /*#__PURE__*/React.createElement(ApaasMultipleSelect, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
       value: val,
       disabled: t.isEdit || disabled,
@@ -8704,9 +8714,6 @@ var SubForm = function SubForm(props) {
           other: ''
         };
       }
-      if (['SELECT'].includes(next.workOrderComponentType)) {
-        item.defaultValue = '';
-      }
       prv["".concat(next.key, "_").concat(WidgetMap[next.workOrderComponentType])] = item;
       return prv;
     }, {});
@@ -12310,7 +12317,7 @@ var jstGoods = function jstGoods(props) {
     changeIndex = _useState2[0],
     setChangeIndex = _useState2[1]; //选中的包裹
   var sendOptions = SendDataCenter.getInstance(platformType).getSendData();
-  var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst'].includes(platformType);
+  var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy'].includes(platformType);
   var expressDateInstance = ExpressData.getInstance(platformType);
   var isSendGoodSavedId = isSelectName && !['jst'].includes(platformType);
   useEffect(function () {

package/dist/index.js

@@ -8217,6 +8217,11 @@ var CheckboxRender = function CheckboxRender(_ref4) {
   }
   return value === null || value === void 0 ? void 0 : (_value$value4 = value.value) === null || _value$value4 === void 0 ? void 0 : _value$value4.join('/');
 };
+var MultipleSelectRender = function MultipleSelectRender(_ref5) {
+  var _ref5$value = _ref5.value,
+    value = _ref5$value === void 0 ? [] : _ref5$value;
+  return value === null || value === void 0 ? void 0 : value.join(',');
+};
 var renderMap = {
   PICTURE: function PICTURE() {
     var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -8243,16 +8248,21 @@ var renderMap = {
     return /*#__PURE__*/React__default['default'].createElement(CheckboxRender, {
       value: value
     });
+  },
+  BASIC_MULT_SELECT: function BASIC_MULT_SELECT(value) {
+    return /*#__PURE__*/React__default['default'].createElement(MultipleSelectRender, {
+      value: value
+    });
   }
 };
-var EditPictureRender = function EditPictureRender(_ref5) {
-  var _ref5$val = _ref5.val,
-    val = _ref5$val === void 0 ? [] : _ref5$val,
-    index = _ref5.index,
-    t = _ref5.t,
-    updateHandle = _ref5.updateHandle,
-    disabled = _ref5.disabled,
-    hostUrl = _ref5.hostUrl;
+var EditPictureRender = function EditPictureRender(_ref6) {
+  var _ref6$val = _ref6.val,
+    val = _ref6$val === void 0 ? [] : _ref6$val,
+    index = _ref6.index,
+    t = _ref6.t,
+    updateHandle = _ref6.updateHandle,
+    disabled = _ref6.disabled,
+    hostUrl = _ref6.hostUrl;
   var finalPictures = val.map(function (item) {
     return item.startsWith('http') ? item : "".concat(hostUrl, "/").concat(item);
   });
@@ -8287,14 +8297,14 @@ var EditPictureRender = function EditPictureRender(_ref5) {
     hostUrl: hostUrl
   }));
 };
-var EditFileRender = function EditFileRender(_ref6) {
-  var _ref6$val = _ref6.val,
-    val = _ref6$val === void 0 ? [] : _ref6$val,
-    index = _ref6.index,
-    t = _ref6.t,
-    updateHandle = _ref6.updateHandle,
-    disabled = _ref6.disabled,
-    hostUrl = _ref6.hostUrl;
+var EditFileRender = function EditFileRender(_ref7) {
+  var _ref7$val = _ref7.val,
+    val = _ref7$val === void 0 ? [] : _ref7$val,
+    index = _ref7.index,
+    t = _ref7.t,
+    updateHandle = _ref7.updateHandle,
+    disabled = _ref7.disabled,
+    hostUrl = _ref7.hostUrl;
   return /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       display: 'flex',
@@ -8326,13 +8336,13 @@ var EditFileRender = function EditFileRender(_ref6) {
   }));
 };
 var EditRenderMap = {
-  INPUT: function INPUT(_ref7) {
-    var val = _ref7.val,
-      record = _ref7.record,
-      index = _ref7.index,
-      t = _ref7.t,
-      updateHandle = _ref7.updateHandle,
-      disabled = _ref7.disabled;
+  INPUT: function INPUT(_ref8) {
+    var val = _ref8.val,
+      record = _ref8.record,
+      index = _ref8.index,
+      t = _ref8.t,
+      updateHandle = _ref8.updateHandle,
+      disabled = _ref8.disabled;
     var precisionValue = t.precision === 'nolimit' ? undefined : t.precision;
     return !t.isEdit && !disabled ? t.isNumber ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
       style: {
@@ -8355,13 +8365,13 @@ var EditRenderMap = {
       }
     }) : /*#__PURE__*/React__default['default'].createElement("div", null, val);
   },
-  TEXTAREA: function TEXTAREA(_ref8) {
-    var val = _ref8.val,
-      record = _ref8.record,
-      index = _ref8.index,
-      t = _ref8.t,
-      updateHandle = _ref8.updateHandle,
-      disabled = _ref8.disabled;
+  TEXTAREA: function TEXTAREA(_ref9) {
+    var val = _ref9.val,
+      record = _ref9.record,
+      index = _ref9.index,
+      t = _ref9.t,
+      updateHandle = _ref9.updateHandle,
+      disabled = _ref9.disabled;
     var precisionValue = t.precision === 'nolimit' ? undefined : t.precision;
     return !t.isEdit && !disabled ? t.isNumber ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
       style: {
@@ -8384,13 +8394,13 @@ var EditRenderMap = {
       }
     }) : /*#__PURE__*/React__default['default'].createElement("div", null, val);
   },
-  PICTURE: function PICTURE(_ref9) {
-    var val = _ref9.val,
-      record = _ref9.record,
-      index = _ref9.index,
-      t = _ref9.t,
-      updateHandle = _ref9.updateHandle,
-      disabled = _ref9.disabled;
+  PICTURE: function PICTURE(_ref10) {
+    var val = _ref10.val,
+      record = _ref10.record,
+      index = _ref10.index,
+      t = _ref10.t,
+      updateHandle = _ref10.updateHandle,
+      disabled = _ref10.disabled;
     return !t.isEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(EditPictureRender, {
       val: val,
       t: t,
@@ -8404,13 +8414,13 @@ var EditRenderMap = {
       hostUrl: hostUrl
     });
   },
-  FILE: function FILE(_ref10) {
-    var val = _ref10.val,
-      record = _ref10.record,
-      index = _ref10.index,
-      t = _ref10.t,
-      updateHandle = _ref10.updateHandle,
-      disabled = _ref10.disabled;
+  FILE: function FILE(_ref11) {
+    var val = _ref11.val,
+      record = _ref11.record,
+      index = _ref11.index,
+      t = _ref11.t,
+      updateHandle = _ref11.updateHandle,
+      disabled = _ref11.disabled;
     return !t.isEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(EditFileRender, {
       val: val,
       t: t,
@@ -8423,23 +8433,7 @@ var EditRenderMap = {
       canDownload: true
     });
   },
-  RADIO: function RADIO(_ref11) {
-    var val = _ref11.val,
-      record = _ref11.record,
-      index = _ref11.index,
-      t = _ref11.t,
-      updateHandle = _ref11.updateHandle,
-      disabled = _ref11.disabled,
-      componentDto = _ref11.componentDto;
-    return /*#__PURE__*/React__default['default'].createElement(ApaasRadio, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
-      value: val,
-      disabled: t.isEdit || disabled,
-      onChange: function onChange(e) {
-        return updateHandle(e, index, t.key);
-      }
-    }));
-  },
-  SELECT: function SELECT(_ref12) {
+  RADIO: function RADIO(_ref12) {
     var val = _ref12.val,
       record = _ref12.record,
       index = _ref12.index,
@@ -8447,7 +8441,7 @@ var EditRenderMap = {
       updateHandle = _ref12.updateHandle,
       disabled = _ref12.disabled,
       componentDto = _ref12.componentDto;
-    return /*#__PURE__*/React__default['default'].createElement(ApaasSelect, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
+    return /*#__PURE__*/React__default['default'].createElement(ApaasRadio, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
       value: val,
       disabled: t.isEdit || disabled,
       onChange: function onChange(e) {
@@ -8455,7 +8449,7 @@ var EditRenderMap = {
       }
     }));
   },
-  CHECKBOX: function CHECKBOX(_ref13) {
+  SELECT: function SELECT(_ref13) {
     var val = _ref13.val,
       record = _ref13.record,
       index = _ref13.index,
@@ -8463,7 +8457,7 @@ var EditRenderMap = {
       updateHandle = _ref13.updateHandle,
       disabled = _ref13.disabled,
       componentDto = _ref13.componentDto;
-    return /*#__PURE__*/React__default['default'].createElement(ApaasCheckbox, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
+    return /*#__PURE__*/React__default['default'].createElement(ApaasSelect, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
       value: val,
       disabled: t.isEdit || disabled,
       onChange: function onChange(e) {
@@ -8471,7 +8465,7 @@ var EditRenderMap = {
       }
     }));
   },
-  BASIC_MULT_SELECT: function BASIC_MULT_SELECT(_ref14) {
+  CHECKBOX: function CHECKBOX(_ref14) {
     var val = _ref14.val,
       record = _ref14.record,
       index = _ref14.index,
@@ -8479,6 +8473,22 @@ var EditRenderMap = {
       updateHandle = _ref14.updateHandle,
       disabled = _ref14.disabled,
       componentDto = _ref14.componentDto;
+    return /*#__PURE__*/React__default['default'].createElement(ApaasCheckbox, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
+      value: val,
+      disabled: t.isEdit || disabled,
+      onChange: function onChange(e) {
+        return updateHandle(e, index, t.key);
+      }
+    }));
+  },
+  BASIC_MULT_SELECT: function BASIC_MULT_SELECT(_ref15) {
+    var val = _ref15.val,
+      record = _ref15.record,
+      index = _ref15.index,
+      t = _ref15.t,
+      updateHandle = _ref15.updateHandle,
+      disabled = _ref15.disabled,
+      componentDto = _ref15.componentDto;
     return /*#__PURE__*/React__default['default'].createElement(ApaasMultipleSelect, _objectSpread2(_objectSpread2({}, componentDto === null || componentDto === void 0 ? void 0 : componentDto.componentConfig), {}, {
       value: val,
       disabled: t.isEdit || disabled,
@@ -8717,9 +8727,6 @@ var SubForm = function SubForm(props) {
           other: ''
         };
       }
-      if (['SELECT'].includes(next.workOrderComponentType)) {
-        item.defaultValue = '';
-      }
       prv["".concat(next.key, "_").concat(WidgetMap[next.workOrderComponentType])] = item;
       return prv;
     }, {});
@@ -12323,7 +12330,7 @@ var jstGoods = function jstGoods(props) {
     changeIndex = _useState2[0],
     setChangeIndex = _useState2[1]; //选中的包裹
   var sendOptions = kmkfUtils.SendDataCenter.getInstance(platformType).getSendData();
-  var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst'].includes(platformType);
+  var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst', 'jy'].includes(platformType);
   var expressDateInstance = kmkfUtils.ExpressData.getInstance(platformType);
   var isSendGoodSavedId = isSelectName && !['jst'].includes(platformType);
   React.useEffect(function () {

package/dist/src/apaas/SubForm/render.d.ts

@@ -12,6 +12,9 @@ export declare const RadioRender: ({ value }: {
 export declare const CheckboxRender: ({ value }: {
     value: any;
 }) => any;
+export declare const MultipleSelectRender: ({ value }: {
+    value: any;
+}) => any;
 export declare const renderMap: Record<string, (props: any) => React.ReactNode>;
 export declare const EditPictureRender: ({ val, index, t, updateHandle, disabled, hostUrl, }: any) => React.JSX.Element;
 export declare const EditFileRender: ({ val, index, t, updateHandle, disabled, hostUrl, }: any) => React.JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.2.5-beta.4",
+  "version": "2.2.5-beta.6",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,7 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "2.2.5-beta.4",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.5-beta.5",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d27a851a34ed90be31aa28cbe6554c4522e67e9a"
+  "gitHead": "3d4d3383179b439c41d2162767d4d25eacf98ce4"
 }