@zgfe/modules-settings 2.1.0-zhongyuan.23 → 2.1.0-zhongyuan.25

package/es/modules/companySetting/application/applicationForm.d.ts

@@ -19,6 +19,6 @@ declare const _default: React.ForwardRefExoticComponent<{
     name?: string | undefined;
     appVersion?: number | undefined;
     currentUser?: any;
-    appType?: string | undefined;
+    category?: string | undefined;
 } & React.RefAttributes<React.FC<{}>>>;
 export default _default;

package/es/modules/companySetting/application/applicationForm.js

@@ -26,7 +26,8 @@ export var AppVersion;
 var ApplicationForm = function ApplicationForm(props, ref) {
   var name = props.name,
     currentUser = props.currentUser,
-    appType = props.appType;
+    _props$category = props.category,
+    category = _props$category === void 0 ? '1' : _props$category;
   var _useState = useState(true),
     _useState2 = _slicedToArray(_useState, 2),
     showChunk = _useState2[0],
@@ -57,12 +58,12 @@ var ApplicationForm = function ApplicationForm(props, ref) {
         value: name
       }]);
       form.setFields([{
-        name: 'appType',
-        value: appType
+        name: 'category',
+        value: category
       }]);
       setShowchunk(false);
     }
-  }, [name, appType]);
+  }, [name, category]);
   return /*#__PURE__*/React.createElement(Form, {
     form: form,
     labelCol: {
@@ -70,7 +71,8 @@ var ApplicationForm = function ApplicationForm(props, ref) {
     },
     layout: "horizontal",
     initialValues: {
-      appVersion: (currentUser === null || currentUser === void 0 ? void 0 : currentUser.companyBuyVersion) == 0 ? AppVersion.common : currentUser === null || currentUser === void 0 ? void 0 : currentUser.companyBuyVersion
+      appVersion: (currentUser === null || currentUser === void 0 ? void 0 : currentUser.companyBuyVersion) == 0 ? AppVersion.common : currentUser === null || currentUser === void 0 ? void 0 : currentUser.companyBuyVersion,
+      category: '1'
     }
   }, showChunk && (currentUser === null || currentUser === void 0 ? void 0 : currentUser.companyBuyVersion) == 0 && (/*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Alert, {
     className: "".concat(classPrefix, "-alert-info"),
@@ -86,27 +88,9 @@ var ApplicationForm = function ApplicationForm(props, ref) {
   }, "\u901A\u7528\u7248\u672C"), /*#__PURE__*/React.createElement(Radio, {
     value: AppVersion.bank
   }, "\u57CE\u5546\u884C\u573A\u666F\u7248\u672C"))))), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "name",
-    required: true,
-    rules: [{
-      required: true,
-      validateTrigger: 'submit',
-      validator: function validator(rule, value, callback) {
-        if (!value) {
-          return Promise.reject('应用名称不可为空');
-        }
-        return Promise.resolve();
-      }
-    }]
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u8BF7\u8F93\u5165\u5E94\u7528\u540D\u79F0",
-    showCount: true,
-    maxLength: 20
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: 'appType',
+    name: "category",
     className: "app-list-form-item"
   }, /*#__PURE__*/React.createElement(Select, {
-    defaultValue: "1",
     options: [{
       value: '1',
       label: '零售'
@@ -126,6 +110,23 @@ var ApplicationForm = function ApplicationForm(props, ref) {
       value: '6',
       label: '其他'
     }]
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    name: "name",
+    required: true,
+    rules: [{
+      required: true,
+      validateTrigger: 'submit',
+      validator: function validator(rule, value, callback) {
+        if (!value) {
+          return Promise.reject('应用名称不可为空');
+        }
+        return Promise.resolve();
+      }
+    }]
+  }, /*#__PURE__*/React.createElement(Input, {
+    placeholder: "\u8BF7\u8F93\u5165\u5E94\u7528\u540D\u79F0",
+    showCount: true,
+    maxLength: 20
   })), showChunk && (/*#__PURE__*/React.createElement(Form.Item, {
     style: {
       color: '#9AA1A9'

package/es/modules/companySetting/user/invite.js

@@ -138,7 +138,7 @@ var UserGroup = function UserGroup(props) {
     setCreateAppLoading(true);
     var msg = '';
     var params = _objectSpread(_objectSpread({}, value), {}, {
-      password: "ZG_".concat(value.email).concat(getDate()),
+      password: "Aa111111",
       id: userEditAuthData === null || userEditAuthData === void 0 ? void 0 : userEditAuthData.id,
       roleIds: value === null || value === void 0 ? void 0 : (_value$roleIds = value.roleIds) === null || _value$roleIds === void 0 ? void 0 : _value$roleIds.map(function (item) {
         return item.id;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "2.1.0-zhongyuan.23",
+  "version": "2.1.0-zhongyuan.25",
   "private": false,
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -67,7 +67,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "12c1d4ab5b6ebbeb66299e23aa8f9726672d02d8",
+  "gitHead": "f9bbe18ea9f27c0a392e59cea858f430bea25292",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }