kmkf-work-order-service-component 0.4.0-alpha.29 → 0.4.0-alpha.30

package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CustomizeWorkOrderCard/index.js

@@ -42,10 +42,11 @@ function CustomizeWorkOrderCard(props) {
   var _item$handlerList, _item$handlerList$map;
 
   var item = props.item,
-      enabledTemplateList = props.enabledTemplateList;
+      enabledTemplateList = props.enabledTemplateList,
+      singleTemplateDetails = props.singleTemplateDetails;
   var dispatch = useAppDispatch();
   var componentDtoList = useAppSelector(selectorAllTemplateList);
-  var filterComponentDtoList = componentDtoList.filter(function (i) {
+  var filterComponentDtoList = singleTemplateDetails || componentDtoList.filter(function (i) {
     return !['WORK_ORDER_ID_INPUT', // 工单ID
     'TEMPLATE_ID_INPUT', // 模板Id
     'FLOW_STATUS_SELECT', // 工单状态

package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/index.js

@@ -33,7 +33,7 @@ import StatusSelectModal from "./components/StatusSelectModal";
 import RecordLog from "./components/RecordLog";
 import emptyImg from "../../../common/imgs/empty.png";
 import { PlatForm } from "../../types";
-import { queryAllWorkOrderList } from "../../../model/servers/api";
+import { queryAllWorkOrderList, queryTemplateDetail } from "../../../model/servers/api";
 import FormRender from "../../../FormRender";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -146,6 +146,11 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
       title = _useState6[0],
       setTitle = _useState6[1];
 
+  var _useState7 = useState(null),
+      _useState8 = _slicedToArray(_useState7, 2),
+      searchTemplateDetails = _useState8[0],
+      setSearchTemplateDetails = _useState8[1];
+
   var groupAllList = useAppSelector(function (state) {
     return state.workOrder.groupAllList;
   });
@@ -205,6 +210,26 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
     dispatch(fetchAllComponentList);
   }, []);
 
+  var searchHandle = function searchHandle() {
+    var templateList = form.getFieldValue('templateIdList');
+
+    if (templateList && templateList.length) {
+      var tempId = templateList[templateList.length - 1];
+
+      if ((searchTemplateDetails === null || searchTemplateDetails === void 0 ? void 0 : searchTemplateDetails.uniqueKey) !== tempId) {
+        queryTemplateDetail({
+          uniqueKey: tempId
+        }).then(function (res) {
+          setSearchTemplateDetails(res === null || res === void 0 ? void 0 : res.data);
+          submit();
+        });
+      }
+    } else {
+      setSearchTemplateDetails(null);
+      submit();
+    }
+  };
+
   var searchForm = /*#__PURE__*/_jsxs("div", {
     children: [/*#__PURE__*/_jsx(Form, {
       form: form,
@@ -261,7 +286,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
               options: groupAllList,
               placeholder: "\u8BF7\u9009\u62E9\u6A21\u7248",
               showSearch: true,
-              allowClear: false
+              allowClear: true
             })
           })
         }), /*#__PURE__*/_jsx(Col, {
@@ -279,7 +304,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
       children: [/*#__PURE__*/_jsxs("span", {
         children: [/*#__PURE__*/_jsx(Button, {
           type: "primary",
-          onClick: submit,
+          onClick: searchHandle,
           children: "\u67E5\u8BE2"
         }), /*#__PURE__*/_jsx(Button, {
           onClick: reset,
@@ -347,7 +372,8 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
         children: dataSource.length > 0 ? dataSource.map(function (item) {
           return /*#__PURE__*/_jsx(CustomizeWorkOrderCard, {
             item: item,
-            enabledTemplateList: enabledTemplateList
+            enabledTemplateList: enabledTemplateList,
+            singleTemplateDetails: searchTemplateDetails === null || searchTemplateDetails === void 0 ? void 0 : searchTemplateDetails.componentDtoList
           }, item.id);
         }) : /*#__PURE__*/_jsx("div", {
           className: "custom_box_main_empty",

package/dist/esm/WorkOrder/components/Widget/basic/Checkbox/index.js

@@ -42,7 +42,6 @@ import BasicComponent from "../../BasicComponent";
 import { ApaasCheckbox } from '@raycloud-apaas-fe-setup/apaas-react-basics-widgets';
 import { getFormItem } from "../../common/formItemWrap";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
 
 var BasicCheckBox = /*#__PURE__*/function (_BasicComponent) {
   _inherits(BasicCheckBox, _BasicComponent);
@@ -57,19 +56,27 @@ var BasicCheckBox = /*#__PURE__*/function (_BasicComponent) {
     _this = _super.call(this, options);
 
     _defineProperty(_assertThisInitialized(_this), "render", function (value) {
-      var _value$value;
+      var _value$value, _value$value2;
 
-      return /*#__PURE__*/_jsxs("span", {
-        children: [value === null || value === void 0 ? void 0 : (_value$value = value.value) === null || _value$value === void 0 ? void 0 : _value$value.join('/'), /*#__PURE__*/_jsx("br", {}), value === null || value === void 0 ? void 0 : value.other]
+      var findIndex = value === null || value === void 0 ? void 0 : (_value$value = value.value) === null || _value$value === void 0 ? void 0 : _value$value.findIndex(function (item) {
+        return item === '其他';
+      });
+
+      if (findIndex > -1 && value !== null && value !== void 0 && value.other) {
+        value.value[findIndex] = "\u5176\u4ED6(".concat(value === null || value === void 0 ? void 0 : value.other, ")");
+      }
+
+      return /*#__PURE__*/_jsx("span", {
+        children: value === null || value === void 0 ? void 0 : (_value$value2 = value.value) === null || _value$value2 === void 0 ? void 0 : _value$value2.join('/')
       });
     });
 
     _defineProperty(_assertThisInitialized(_this), "customRules", function () {
       return [{
         validator: function validator(_, value) {
-          var _value$value2;
+          var _value$value3;
 
-          if (!(value !== null && value !== void 0 && (_value$value2 = value.value) !== null && _value$value2 !== void 0 && _value$value2.length)) {
+          if (!(value !== null && value !== void 0 && (_value$value3 = value.value) !== null && _value$value3 !== void 0 && _value$value3.length)) {
             return Promise.reject(new Error('请选择'));
           }
 
@@ -92,9 +99,9 @@ var BasicCheckBox = /*#__PURE__*/function (_BasicComponent) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "renderExport", function (value, record) {
-      var _value$value3;
+      var _value$value4;
 
-      return "".concat(value === null || value === void 0 ? void 0 : (_value$value3 = value.value) === null || _value$value3 === void 0 ? void 0 : _value$value3.join('/'), " ").concat((value === null || value === void 0 ? void 0 : value.other) || '');
+      return "".concat(value === null || value === void 0 ? void 0 : (_value$value4 = value.value) === null || _value$value4 === void 0 ? void 0 : _value$value4.join('/'), " ").concat((value === null || value === void 0 ? void 0 : value.other) || '');
     });
 
     _defineProperty(_assertThisInitialized(_this), "getColumns", function () {

package/dist/esm/WorkOrder/components/Widget/basic/Radio/index.js

@@ -69,7 +69,7 @@ var BasicRadio = /*#__PURE__*/function (_BasicComponent) {
       var _value$value;
 
       return /*#__PURE__*/_jsxs("span", {
-        children: [value === null || value === void 0 ? void 0 : value.value, (value === null || value === void 0 ? void 0 : (_value$value = value.value) === null || _value$value === void 0 ? void 0 : _value$value.indexOf('其他')) > -1 && (value === null || value === void 0 ? void 0 : value.other)]
+        children: [value === null || value === void 0 ? void 0 : value.value, (value === null || value === void 0 ? void 0 : (_value$value = value.value) === null || _value$value === void 0 ? void 0 : _value$value.indexOf('其他')) > -1 && (value === null || value === void 0 ? void 0 : value.other) && "(".concat(value === null || value === void 0 ? void 0 : value.other, ")")]
       });
     });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.4.0-alpha.29",
+  "version": "0.4.0-alpha.30",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",