@deepinnet-components/pc 0.0.23 → 0.0.24
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/UserCenter/ConfigProvider/index.d.ts +1 -0
- package/dist/UserCenter/ConfigProvider/index.js +5 -2
- package/dist/UserCenter/MemberSelect/index.js +15 -3
- package/dist/UserCenter/OrgPage/components/CreateMember/index.js +72 -39
- package/dist/UserCenter/OrgPage/index.js +8 -2
- package/package.json +1 -1
|
@@ -63,7 +63,9 @@ var Index = function Index(props) {
|
|
|
63
63
|
_props$hideDeleteAcco = props.hideDeleteAccountBtn,
|
|
64
64
|
hideDeleteAccountBtn = _props$hideDeleteAcco === void 0 ? false : _props$hideDeleteAcco,
|
|
65
65
|
_props$hideMemberType = props.hideMemberType,
|
|
66
|
-
hideMemberType = _props$hideMemberType === void 0 ? false : _props$hideMemberType
|
|
66
|
+
hideMemberType = _props$hideMemberType === void 0 ? false : _props$hideMemberType,
|
|
67
|
+
_props$showMemberPilo = props.showMemberPilot,
|
|
68
|
+
showMemberPilot = _props$showMemberPilo === void 0 ? false : _props$showMemberPilo;
|
|
67
69
|
var _useState = useState(),
|
|
68
70
|
_useState2 = _slicedToArray(_useState, 2),
|
|
69
71
|
value = _useState2[0],
|
|
@@ -211,7 +213,8 @@ var Index = function Index(props) {
|
|
|
211
213
|
isMultiRole: isMultiRole,
|
|
212
214
|
passwordEncryption: passwordEncryption,
|
|
213
215
|
hideDeleteAccountBtn: hideDeleteAccountBtn,
|
|
214
|
-
hideMemberType: hideMemberType
|
|
216
|
+
hideMemberType: hideMemberType,
|
|
217
|
+
showMemberPilot: showMemberPilot
|
|
215
218
|
});
|
|
216
219
|
}, []);
|
|
217
220
|
if (!value) return null;
|
|
@@ -17,7 +17,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
|
|
|
17
17
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
18
18
|
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
|
|
19
19
|
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
|
|
20
|
-
import { Select } from 'antd';
|
|
20
|
+
import { Select, Tag } from 'antd';
|
|
21
21
|
import { debounce } from 'lodash-es';
|
|
22
22
|
import React, { useContext, useEffect, useState } from 'react';
|
|
23
23
|
import ValueContext from "../context";
|
|
@@ -25,7 +25,8 @@ import ValueContext from "../context";
|
|
|
25
25
|
// 成员选择
|
|
26
26
|
var MemberSelect = function MemberSelect(props) {
|
|
27
27
|
var contextValue = useContext(ValueContext);
|
|
28
|
-
var ApiService = contextValue.ApiService
|
|
28
|
+
var ApiService = contextValue.ApiService,
|
|
29
|
+
showMemberPilot = contextValue.showMemberPilot;
|
|
29
30
|
var _props$searchParams = props.searchParams,
|
|
30
31
|
searchParams = _props$searchParams === void 0 ? {} : _props$searchParams,
|
|
31
32
|
comProps = _objectWithoutProperties(props, _excluded); // searchParams 外部传过来的额外搜索条件
|
|
@@ -126,7 +127,18 @@ var MemberSelect = function MemberSelect(props) {
|
|
|
126
127
|
label: 'name',
|
|
127
128
|
value: 'id'
|
|
128
129
|
},
|
|
129
|
-
onFocus: onFocus
|
|
130
|
+
onFocus: onFocus,
|
|
131
|
+
optionRender: function optionRender(option) {
|
|
132
|
+
var _option$data$identity;
|
|
133
|
+
var showPilot = (_option$data$identity = option.data.identityTypes) === null || _option$data$identity === void 0 ? void 0 : _option$data$identity.includes('pilot');
|
|
134
|
+
return /*#__PURE__*/React.createElement("div", {
|
|
135
|
+
className: "flex items-center"
|
|
136
|
+
}, /*#__PURE__*/React.createElement("div", null, option.label), showMemberPilot && showPilot && /*#__PURE__*/React.createElement("div", {
|
|
137
|
+
className: "ml-[8px]"
|
|
138
|
+
}, /*#__PURE__*/React.createElement(Tag, {
|
|
139
|
+
color: 'blue'
|
|
140
|
+
}, "\u98DE\u624B")));
|
|
141
|
+
}
|
|
130
142
|
})));
|
|
131
143
|
};
|
|
132
144
|
export default MemberSelect;
|
|
@@ -1,10 +1,5 @@
|
|
|
1
1
|
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
2
2
|
function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
|
|
3
|
-
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
4
|
-
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
5
|
-
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
6
|
-
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
|
|
7
|
-
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
8
3
|
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
|
|
9
4
|
function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
|
|
10
5
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
@@ -16,16 +11,34 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
|
16
11
|
import { Form, FormItem, Input, Select } from '@formily/antd-v5';
|
|
17
12
|
import { createForm } from '@formily/core';
|
|
18
13
|
import { createSchemaField } from '@formily/react';
|
|
19
|
-
import { Modal, message } from 'antd';
|
|
14
|
+
import { Modal, message, Checkbox } from 'antd';
|
|
20
15
|
import React, { useContext, useEffect, useMemo, useState } from 'react';
|
|
21
16
|
import OrgSelect from "../../../OrgSelect";
|
|
22
17
|
import { MEMBER_TYPE_ENUM, MEMBER_TYPE_TEXT_ENUM } from "../../../enum";
|
|
23
18
|
import ValueContext from "../../../context";
|
|
19
|
+
var MemberPilot = function MemberPilot(props) {
|
|
20
|
+
var value = props.value;
|
|
21
|
+
var _useState = useState(value || false),
|
|
22
|
+
_useState2 = _slicedToArray(_useState, 2),
|
|
23
|
+
checked = _useState2[0],
|
|
24
|
+
setChecked = _useState2[1];
|
|
25
|
+
useEffect(function () {
|
|
26
|
+
setChecked(value || false);
|
|
27
|
+
}, [value]);
|
|
28
|
+
function onChange(e) {
|
|
29
|
+
props.onChange(e.target.checked);
|
|
30
|
+
}
|
|
31
|
+
return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Checkbox, {
|
|
32
|
+
checked: checked,
|
|
33
|
+
onChange: onChange
|
|
34
|
+
}, "\u662F\u98DE\u624B(\u5F53\u9700\u5F15\u5165\u5916\u90E8\u98DE\u624B\u4EE3\u53D1\u5E03\u5E94\u6025\u9700\u6C42\u65F6\u4F7F\u7528)"));
|
|
35
|
+
};
|
|
24
36
|
var SchemaField = createSchemaField({
|
|
25
37
|
components: {
|
|
26
38
|
FormItem: FormItem,
|
|
27
39
|
Select: Select,
|
|
28
40
|
Input: Input,
|
|
41
|
+
MemberPilot: MemberPilot,
|
|
29
42
|
OrgSelect: OrgSelect
|
|
30
43
|
}
|
|
31
44
|
});
|
|
@@ -38,7 +51,8 @@ var CreateMember = function CreateMember(props) {
|
|
|
38
51
|
onSuccess = props.onSuccess;
|
|
39
52
|
var contextValue = useContext(ValueContext);
|
|
40
53
|
var ApiService = contextValue.ApiService,
|
|
41
|
-
hideMemberType = contextValue.hideMemberType
|
|
54
|
+
hideMemberType = contextValue.hideMemberType,
|
|
55
|
+
showMemberPilot = contextValue.showMemberPilot;
|
|
42
56
|
useEffect(function () {
|
|
43
57
|
if (visible) {
|
|
44
58
|
if (addOrEdit === 'add') {
|
|
@@ -46,11 +60,13 @@ var CreateMember = function CreateMember(props) {
|
|
|
46
60
|
pid: pid
|
|
47
61
|
});
|
|
48
62
|
} else {
|
|
63
|
+
var _actionRow$identityTy;
|
|
49
64
|
form.setValues({
|
|
50
65
|
pid: pid,
|
|
51
66
|
name: actionRow.name,
|
|
52
67
|
phone: actionRow.phone,
|
|
53
|
-
type: actionRow.type
|
|
68
|
+
type: actionRow.type,
|
|
69
|
+
memberPilot: (_actionRow$identityTy = actionRow.identityTypes) === null || _actionRow$identityTy === void 0 ? void 0 : _actionRow$identityTy.includes('pilot')
|
|
54
70
|
});
|
|
55
71
|
}
|
|
56
72
|
} else {
|
|
@@ -61,10 +77,10 @@ var CreateMember = function CreateMember(props) {
|
|
|
61
77
|
var str = addOrEdit === 'add' ? '添加成员' : '编辑成员';
|
|
62
78
|
return str;
|
|
63
79
|
}, [addOrEdit]);
|
|
64
|
-
var
|
|
65
|
-
|
|
66
|
-
loading =
|
|
67
|
-
setLoading =
|
|
80
|
+
var _useState3 = useState(false),
|
|
81
|
+
_useState4 = _slicedToArray(_useState3, 2),
|
|
82
|
+
loading = _useState4[0],
|
|
83
|
+
setLoading = _useState4[1];
|
|
68
84
|
function handleOk() {
|
|
69
85
|
return _handleOk.apply(this, arguments);
|
|
70
86
|
}
|
|
@@ -79,23 +95,22 @@ var CreateMember = function CreateMember(props) {
|
|
|
79
95
|
case 2:
|
|
80
96
|
values = _context.sent;
|
|
81
97
|
if (!(addOrEdit === 'add')) {
|
|
82
|
-
_context.next =
|
|
98
|
+
_context.next = 15;
|
|
83
99
|
break;
|
|
84
100
|
}
|
|
85
101
|
_context.prev = 4;
|
|
86
|
-
params =
|
|
102
|
+
params = {
|
|
87
103
|
departmentId: pid[pid.length - 1],
|
|
88
104
|
name: values.name.trim(),
|
|
89
105
|
phone: values.phone || undefined,
|
|
90
|
-
type: values.type || MEMBER_TYPE_ENUM.NORMAL
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
// console.log(params)
|
|
106
|
+
type: values.type || MEMBER_TYPE_ENUM.NORMAL,
|
|
107
|
+
identityTypes: values.memberPilot ? ['pilot'] : undefined
|
|
108
|
+
}; // console.log(params)
|
|
94
109
|
// return
|
|
95
110
|
setLoading(true);
|
|
96
|
-
_context.next =
|
|
111
|
+
_context.next = 9;
|
|
97
112
|
return ApiService.saveMember(params);
|
|
98
|
-
case
|
|
113
|
+
case 9:
|
|
99
114
|
_yield$ApiService$sav = _context.sent;
|
|
100
115
|
success = _yield$ApiService$sav.success;
|
|
101
116
|
if (success) {
|
|
@@ -103,30 +118,29 @@ var CreateMember = function CreateMember(props) {
|
|
|
103
118
|
onClose === null || onClose === void 0 || onClose();
|
|
104
119
|
onSuccess === null || onSuccess === void 0 || onSuccess();
|
|
105
120
|
}
|
|
106
|
-
case
|
|
107
|
-
_context.prev =
|
|
121
|
+
case 12:
|
|
122
|
+
_context.prev = 12;
|
|
108
123
|
setLoading(false);
|
|
109
|
-
return _context.finish(
|
|
110
|
-
case
|
|
124
|
+
return _context.finish(12);
|
|
125
|
+
case 15:
|
|
111
126
|
if (!(addOrEdit === 'edit')) {
|
|
112
|
-
_context.next =
|
|
127
|
+
_context.next = 27;
|
|
113
128
|
break;
|
|
114
129
|
}
|
|
115
|
-
_context.prev =
|
|
116
|
-
_params =
|
|
130
|
+
_context.prev = 16;
|
|
131
|
+
_params = {
|
|
117
132
|
id: actionRow.id,
|
|
118
133
|
departmentId: pid[pid.length - 1],
|
|
119
134
|
name: values.name.trim(),
|
|
120
135
|
phone: values.phone || undefined,
|
|
121
|
-
type: values.type || MEMBER_TYPE_ENUM.NORMAL
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
// console.log(params)
|
|
136
|
+
type: values.type || MEMBER_TYPE_ENUM.NORMAL,
|
|
137
|
+
identityTypes: values.memberPilot ? ['pilot'] : undefined
|
|
138
|
+
}; // console.log(params)
|
|
125
139
|
// return
|
|
126
140
|
setLoading(true);
|
|
127
|
-
_context.next =
|
|
141
|
+
_context.next = 21;
|
|
128
142
|
return ApiService.saveMember(_params);
|
|
129
|
-
case
|
|
143
|
+
case 21:
|
|
130
144
|
_yield$ApiService$sav2 = _context.sent;
|
|
131
145
|
_success = _yield$ApiService$sav2.success;
|
|
132
146
|
if (_success) {
|
|
@@ -134,15 +148,15 @@ var CreateMember = function CreateMember(props) {
|
|
|
134
148
|
onClose === null || onClose === void 0 || onClose();
|
|
135
149
|
onSuccess === null || onSuccess === void 0 || onSuccess();
|
|
136
150
|
}
|
|
137
|
-
case
|
|
138
|
-
_context.prev =
|
|
151
|
+
case 24:
|
|
152
|
+
_context.prev = 24;
|
|
139
153
|
setLoading(false);
|
|
140
|
-
return _context.finish(
|
|
141
|
-
case
|
|
154
|
+
return _context.finish(24);
|
|
155
|
+
case 27:
|
|
142
156
|
case "end":
|
|
143
157
|
return _context.stop();
|
|
144
158
|
}
|
|
145
|
-
}, _callee, null, [[4,,
|
|
159
|
+
}, _callee, null, [[4,, 12, 15], [16,, 24, 27]]);
|
|
146
160
|
}));
|
|
147
161
|
return _handleOk.apply(this, arguments);
|
|
148
162
|
}
|
|
@@ -182,6 +196,24 @@ var CreateMember = function CreateMember(props) {
|
|
|
182
196
|
message: '请输入成员姓名'
|
|
183
197
|
}]
|
|
184
198
|
},
|
|
199
|
+
memberPilot: {
|
|
200
|
+
type: 'string',
|
|
201
|
+
title: '是否飞手',
|
|
202
|
+
// required: true,
|
|
203
|
+
'x-decorator': 'FormItem',
|
|
204
|
+
'x-component': 'MemberPilot',
|
|
205
|
+
'x-component-props': {
|
|
206
|
+
placeholder: '请选择'
|
|
207
|
+
},
|
|
208
|
+
'x-reactions': [{
|
|
209
|
+
dependencies: [],
|
|
210
|
+
fulfill: {
|
|
211
|
+
state: {
|
|
212
|
+
visible: '{{!!showMemberPilot}}'
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
}]
|
|
216
|
+
},
|
|
185
217
|
phone: {
|
|
186
218
|
type: 'string',
|
|
187
219
|
title: '手机号',
|
|
@@ -249,7 +281,8 @@ var CreateMember = function CreateMember(props) {
|
|
|
249
281
|
schema: schema,
|
|
250
282
|
scope: {
|
|
251
283
|
type: addOrEdit,
|
|
252
|
-
hideMemberType: hideMemberType
|
|
284
|
+
hideMemberType: hideMemberType,
|
|
285
|
+
showMemberPilot: showMemberPilot
|
|
253
286
|
}
|
|
254
287
|
}))));
|
|
255
288
|
};
|
|
@@ -92,7 +92,8 @@ var OrgList = function OrgList() {
|
|
|
92
92
|
var contextValue = useContext(ValueContext);
|
|
93
93
|
var ApiService = contextValue.ApiService,
|
|
94
94
|
Components = contextValue.Components,
|
|
95
|
-
hideMemberType = contextValue.hideMemberType
|
|
95
|
+
hideMemberType = contextValue.hideMemberType,
|
|
96
|
+
showMemberPilot = contextValue.showMemberPilot;
|
|
96
97
|
var _getUrlQuery = getUrlQuery(),
|
|
97
98
|
id = _getUrlQuery.id;
|
|
98
99
|
var _useState = useState([]),
|
|
@@ -186,12 +187,17 @@ var OrgList = function OrgList() {
|
|
|
186
187
|
}, /*#__PURE__*/React.createElement(RightOutlined, null)));
|
|
187
188
|
}
|
|
188
189
|
if (row.showType === 2) {
|
|
190
|
+
var _row$identityTypes;
|
|
189
191
|
var obj = memberMap[row.type];
|
|
190
192
|
return /*#__PURE__*/React.createElement("div", {
|
|
191
193
|
className: "flex items-center"
|
|
192
194
|
}, !hideMemberType && /*#__PURE__*/React.createElement(Tag, {
|
|
193
195
|
color: obj === null || obj === void 0 ? void 0 : obj.color
|
|
194
|
-
}, obj === null || obj === void 0 ? void 0 : obj.name), /*#__PURE__*/React.createElement("div", null, _), row.phone && /*#__PURE__*/React.createElement("div", null, "\uFF08", row.phone, "\uFF09"))
|
|
196
|
+
}, obj === null || obj === void 0 ? void 0 : obj.name), /*#__PURE__*/React.createElement("div", null, _), row.phone && /*#__PURE__*/React.createElement("div", null, "\uFF08", row.phone, "\uFF09"), !!showMemberPilot && ((_row$identityTypes = row.identityTypes) === null || _row$identityTypes === void 0 ? void 0 : _row$identityTypes.includes('pilot')) && /*#__PURE__*/React.createElement("div", {
|
|
197
|
+
className: "ml-[8px]"
|
|
198
|
+
}, /*#__PURE__*/React.createElement(Tag, {
|
|
199
|
+
color: 'blue'
|
|
200
|
+
}, "\u98DE\u624B")));
|
|
195
201
|
}
|
|
196
202
|
}
|
|
197
203
|
}, {
|