@ysjdemo/umi-create-cli 0.0.3 → 0.0.4

package/lib/templates/qiankun/cf-workbench-base/src/pages/Client/clientVersion/data.d.ts

@@ -0,0 +1,60 @@
+import { TableListItem as GroupItem } from '@/pages/EmployeeManagement/group/data';
+import { TableListItem as PostItem } from '@/pages/EmployeeManagement/post/data';
+
+
+export interface UploadFileItem {
+  uploadFileId: string;
+  bucketsName: string;
+  fileName: string;
+
+  originalFileName: number;
+  fileType: string;
+  fileSize: number;
+
+  status: string;
+  remark?: string;
+}
+
+export interface clientVersionControlPackageItem {
+  windowsClientVersionControlPackageId: number;
+  windowsClientVersionControlId: number;
+  packageName: string;
+  path: string;
+  fileSize: number;
+  fileMD5: string;
+}
+
+export interface TableListItem {
+  windowsClientVersionControlId: number;
+  versionCode: string;
+  releaseRemark: string;
+
+  activeDate: date;
+  isRelease: boolean;
+
+  windowsClientVersionControlFullPackageEntity: clientVersionControlPackageItem
+  windowsClientVersionControlUpgradePackageEntity: clientVersionControlPackageItem
+}
+
+export interface TableListPagination {
+  total: number;
+  pageSize: number;
+  current: number;
+}
+
+export interface TableListData {
+  list: TableListItem[];
+  pagination: Partial<TableListPagination>;
+}
+
+export interface TableListParams {
+  pageSize?: number;
+  pageIndex?: number;
+  orderBy?: { [key: string]: any };
+  [propName: string]: any;
+
+}
+
+export interface FormValueType extends Partial<TableListItem> {
+
+}

package/lib/templates/qiankun/cf-workbench-base/src/pages/Client/clientVersion/index.tsx

@@ -0,0 +1,178 @@
+import { PlusOutlined } from '@ant-design/icons';
+import { ProColumns } from '@ant-design/pro-components';
+import {
+  CrudTable,
+  MyPageContainer,
+  MyUpload,
+  useFormatLocale,
+  useIntl,
+  UTCDatePicker,
+  WangEditor,
+  WangEditorView,
+} from '@umijs/max';
+import { Button, Switch, Tooltip } from 'antd';
+import React from 'react';
+import UpdateForm from './components/UpdateForm';
+import { TableListItem } from './data';
+import { handleClientVersion, queryClientVersion, queryClientVersionByID } from './service';
+
+const baseLocalCode = 'pages.ClientVersion';
+const baseLocalName = '客户端版本管理';
+
+//列表数据ID
+const ROW_ID: keyof TableListItem = 'windowsClientVersionControlId';
+
+const TableList: React.FC = () => {
+  const { formatMessage } = useIntl();
+  const { getLocalDate } = useFormatLocale();
+
+  const columns: ProColumns<TableListItem>[] = [
+    {
+      title: formatMessage({ id: 'pages.ClientVersion.column.versionCode', defaultMessage: '版本编号' }),
+      dataIndex: 'versionCode',
+      sorter: true,
+      copyable: true,
+      formItemProps: { rules: [{ required: true }] },
+    },
+    {
+      title: formatMessage({ id: 'pages.ClientVersion.column.activeDate', defaultMessage: '生效时间' }),
+      dataIndex: 'activeDate',
+      sorter: true,
+      valueType: 'dateTime',
+      formItemProps: { rules: [{ required: true }] },
+      renderFormItem: () => <UTCDatePicker showTime />,
+      render: (_, record) => getLocalDate(record.activeDate, { dateFormat: true, timeFormat: true }),
+    },
+    {
+      title: formatMessage({ id: 'pages.ClientVersion.column.isRelease', defaultMessage: '是否发布' }),
+      dataIndex: 'isRelease',
+      sorter: true,
+      valueType: 'switch',
+      hideInForm: true,
+      render: (_, record) => (
+        <Switch
+          disabled
+          defaultChecked={record.isRelease}
+          checkedChildren={formatMessage({
+            id: 'common.pages.yes.text',
+            defaultMessage: '是',
+          })}
+          unCheckedChildren={formatMessage({
+            id: 'common.pages.no.text',
+            defaultMessage: '否',
+          })}
+        />
+      ),
+      formItemProps: { rules: [{ required: true }] },
+    },
+    {
+      title: formatMessage({ id: 'pages.ClientVersion.column.releaseRemark', defaultMessage: '发布说明' }),
+      dataIndex: 'releaseRemark',
+      sorter: true,
+      valueType: 'textarea',
+      copyable: true,
+      ellipsis: true,
+      renderFormItem: (_, { type, defaultRender }) => {
+        if (type === 'form') {
+          return <WangEditor toobarProps={{ mode: 'simple' }} />;
+        }
+        return defaultRender(_);
+      },
+      render: (_, record) => (
+        <Tooltip placement="bottomLeft" title={<WangEditorView html={record.releaseRemark} />}>
+          <div
+            style={{ maxHeight: 30, overflow: 'hidden' }}
+            dangerouslySetInnerHTML={{ __html: record.releaseRemark }}
+          ></div>
+        </Tooltip>
+      ),
+    },
+    {
+      title: formatMessage({ id: 'pages.ClientVersion.column.fullPackage', defaultMessage: '完整安装包' }),
+      dataIndex: 'windowsClientVersionControlFullPackageEntity',
+      search: false,
+      hideInTable: true,
+      formItemProps: { rules: [{ required: true }] },
+      renderFormItem: (_, { type, defaultRender }, form) => {
+        if (type !== 'form') return defaultRender(_);
+        return (
+          <MyUpload
+            bucketName="windowsclientpackages"
+            accept="application/x-msdownload"
+            uploadType="file"
+            maxCount={1}
+            children={
+              <Button icon={<PlusOutlined />}>
+                {formatMessage({ id: 'pages.ClientVersion.column.fullPackage', defaultMessage: '完整安装包' })}
+              </Button>
+            }
+            onChange={(fileList) => {
+              form.setFieldsValue({
+                windowsClientVersionControlFullPackageEntity: {
+                  packageName: fileList[0]?.fileName,
+                  path: fileList[0]?.fileId,
+                },
+              });
+            }}
+          />
+        );
+      },
+    },
+    {
+      title: formatMessage({ id: 'pages.ClientVersion.column.upgradePackage', defaultMessage: '增量更新包' }),
+      dataIndex: 'windowsClientVersionControlUpgradePackageEntity',
+      sorter: true,
+      search: false,
+      hideInTable: true,
+      formItemProps: { rules: [{ required: true }] },
+      renderFormItem: (_, { type, defaultRender }, form) => {
+        if (type !== 'form') return defaultRender(_);
+        return (
+          <MyUpload
+            bucketName="windowsclientpackages"
+            accept=".zip"
+            uploadType="file"
+            maxCount={1}
+            children={
+              <Button icon={<PlusOutlined />}>
+                {formatMessage({
+                  id: 'pages.ClientVersion.upload.upgradePackage.title',
+                  defaultMessage: '增量更新包',
+                })}
+              </Button>
+            }
+            onChange={(fileList) => {
+              form.setFieldsValue({
+                windowsClientVersionControlUpgradePackageEntity: {
+                  packageName: fileList[0]?.fileName,
+                  path: fileList[0]?.fileId,
+                },
+              });
+            }}
+          />
+        );
+      },
+    },
+  ];
+
+  return (
+    <MyPageContainer>
+      <CrudTable<TableListItem>
+        baseLocalCode={baseLocalCode}
+        baseLocalName={baseLocalName}
+        rowKey={ROW_ID}
+        columns={columns}
+        updateConfig={{
+          Component: UpdateForm,
+        }}
+        apis={{
+          query: queryClientVersion,
+          handle: handleClientVersion,
+          queryById: queryClientVersionByID,
+        }}
+      />
+    </MyPageContainer>
+  );
+};
+
+export default TableList;

package/lib/templates/qiankun/cf-workbench-base/src/pages/Client/clientVersion/service.ts

@@ -0,0 +1,28 @@
+import { BASE_API } from '@/constants';
+import { request, API } from '@umijs/max';
+import { TableListParams } from './data';
+
+export async function queryClientVersion(params?: TableListParams) {
+  return request(`${BASE_API}/mes/windowsClientVersionControl/list`, {
+    method: 'GET',
+    params,
+  });
+}
+
+export async function queryClientVersionByID(deptId: number) {
+  return request(`${BASE_API}/mes/windowsClientVersionControl/${deptId}`, {
+    method: 'GET',
+  });
+}
+
+// 增删改查
+export async function handleClientVersion(method = 'POST', params: TableListParams) {
+  const actionById = method === 'DELETE' || method === 'GET';
+  const baseUrl = `${BASE_API}/mes/windowsClientVersionControl`;
+  const url = actionById ? `${baseUrl}/${params}` : baseUrl;
+  const nweParams = actionById ? null : { data: { ...params } };
+  return request<API.Result_Base>(url, {
+    method,
+    ...nweParams,
+  });
+}

package/lib/templates/qiankun/cf-workbench-base/src/pages/System/AccountandSettings/components/BaseView.less

@@ -0,0 +1,56 @@
+.baseView {
+  display: flex;
+  padding-top: 12px;
+
+  :global {
+    .ant-legacy-form-item .ant-legacy-form-item-control-wrapper {
+      width: 100%;
+    }
+  }
+
+  .left {
+    min-width: 224px;
+    max-width: 448px;
+  }
+  .right {
+    flex: 1;
+    padding-left: 104px;
+    .avatar_title {
+      height: 22px;
+      margin-bottom: 8px;
+      color: @heading-color;
+      font-size: @font-size-base;
+      line-height: 22px;
+    }
+    .avatar {
+      width: 144px;
+      height: 144px;
+      margin-bottom: 12px;
+      overflow: hidden;
+      img {
+        width: 100%;
+      }
+    }
+    .button_view {
+      width: 144px;
+      text-align: center;
+    }
+  }
+}
+
+@media screen and (max-width: @screen-xl) {
+  .baseView {
+    flex-direction: column-reverse;
+
+    .right {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      max-width: 448px;
+      padding: 20px;
+      .avatar_title {
+        display: none;
+      }
+    }
+  }
+}

package/lib/templates/qiankun/cf-workbench-base/src/pages/System/AccountandSettings/components/LocaleSetting.tsx

@@ -0,0 +1,87 @@
+import { queryTimeZomeList } from '@/services/user';
+import { ProForm, ProFormSelect } from '@ant-design/pro-components';
+import { cfmmUtils, useIntl, useModel } from '@umijs/max';
+import { Form, message } from 'antd';
+import { useEffect, useState } from 'react';
+
+export interface TimeZomeListType {
+  utcOffset: string;
+  zoneId: string;
+  zoneName: string;
+}
+
+const LocaleSetting = () => {
+  const { formatMessage } = useIntl();
+  const [form] = Form.useForm();
+  const { timeFormat, dateFormat, timeZone, language, updateUserPreferenceSettings } = useModel('user');
+  const [timeZomeList, setTimeZoneList] = useState<TimeZomeListType[]>([]);
+
+  useEffect(() => {
+    queryTimeZomeList()
+      .then((res) => {
+        if (res.code === 200 && res.data) {
+          setTimeZoneList(res.data);
+        }
+      })
+      .catch((error) => {
+        console.log('error', error);
+      });
+  }, []);
+
+  return (
+    <ProForm
+      form={form}
+      onFinish={async (values) => {
+        const hide = message.loading(
+          formatMessage({
+            id: 'accountandsettings.localeSetting.update.waitingMessage',
+            defaultMessage: '正在修改偏好设置',
+          }),
+          0,
+        );
+        const { success } = await updateUserPreferenceSettings(values);
+        hide();
+        if (success) {
+          message.success(
+            formatMessage({
+              id: 'accountandsettings.localeSetting.update.successMessage',
+              defaultMessage: '修改偏好设置成功',
+            }),
+          );
+        }
+      }}
+      wrapperCol={{ span: 9 }}
+    >
+      <ProFormSelect
+        initialValue={language}
+        name="language"
+        label={formatMessage({ id: 'accountandsettings.localeSetting.language', defaultMessage: '语言' })}
+        options={cfmmUtils.languageList}
+      />
+      <ProFormSelect
+        initialValue={dateFormat}
+        name="dateFormat"
+        label={formatMessage({ id: 'accountandsettings.localeSetting.dateFormat', defaultMessage: '日期格式' })}
+        options={cfmmUtils.dateFormatList}
+      />
+      <ProFormSelect
+        initialValue={timeFormat}
+        name="timeFormat"
+        label={formatMessage({ id: 'accountandsettings.localeSetting.timeFormat', defaultMessage: '时间格式' })}
+        options={cfmmUtils.timeFormatList}
+      />
+      <ProFormSelect
+        initialValue={timeZone}
+        showSearch
+        name="timeZone"
+        label={formatMessage({ id: 'accountandsettings.localeSetting.timeZone', defaultMessage: '时区' })}
+        options={timeZomeList.map((item) => ({
+          label: `(${item.utcOffset}) ${item.zoneName}`,
+          value: item.zoneId,
+        }))}
+      />
+    </ProForm>
+  );
+};
+
+export default LocaleSetting;

package/lib/templates/qiankun/cf-workbench-base/src/pages/System/AccountandSettings/components/base.tsx

@@ -0,0 +1,146 @@
+import { updateUserProfile } from '@/pages/System/User/service';
+import { UploadOutlined } from '@ant-design/icons';
+import { useModel } from '@umijs/max';
+import { Button, Form, Input, message, Select, Upload } from 'antd';
+import { useRef, useState } from 'react';
+import { EditMultiLangForm, LangInfoItem, RandomAvatar, useIntl } from 'umi';
+import styles from './BaseView.less';
+const { Option } = Select;
+
+// 头像组件 方便以后独立，增加裁剪之类的功能
+const AvatarView = ({ avatar, userCode }: { avatar: string; userCode: string }) => {
+  const { formatMessage } = useIntl();
+
+  return (
+    <>
+      <div className={styles.avatar_title}>
+        {formatMessage({ id: 'accountandsettings.basic.avatar', defaultMessage: 'Avatar' })}
+      </div>
+      <div className={styles.avatar}>
+        {avatar ? <img src={avatar} alt="avatar" /> : <RandomAvatar avatarCode={userCode} width={120} />}
+      </div>
+      <Upload showUploadList={false}>
+        <div className={styles.button_view}>
+          <Button>
+            <UploadOutlined />
+            {formatMessage({ id: 'accountandsettings.basic.change-avatar', defaultMessage: 'Change avatar' })}
+          </Button>
+        </div>
+      </Upload>
+    </>
+  );
+};
+
+const BaseView = () => {
+  const { formatMessage } = useIntl();
+
+  const { currentUser, fetchCurrent } = useModel('user');
+  const [modalFormVisible, setModalFormVisible] = useState(false);
+  let viewRef = useRef(null);
+
+  const getAvatarURL = () => {
+    if (currentUser) {
+      if (currentUser.avatar) {
+        // return currentUser.avatar;
+      }
+      return '';
+    }
+    return '';
+  };
+
+  const handleFinish = async (values: any) => {
+    const result = await updateUserProfile({ ...values, userId: currentUser && currentUser.userId });
+    if (result && result.code === 200) {
+      message.success(formatMessage({ id: 'accountandsettings.basic.update.success' }));
+    }
+
+    fetchCurrent();
+  };
+  const handleEditMutilLan = () => {
+    setModalFormVisible(true);
+  };
+
+  const handleModalFormVisible = (visible: boolean) => {
+    setModalFormVisible(visible);
+  };
+
+  const langInfoItem: LangInfoItem = { tableName: 'sys_user', columnName: 'user_name', recordId: currentUser?.userId };
+  return (
+    <div className={styles.baseView} ref={viewRef}>
+      <div className={styles.left}>
+        <Form layout="vertical" onFinish={handleFinish} initialValues={currentUser} hideRequiredMark>
+          <Form.Item
+            name="userCode"
+            label={formatMessage({ id: 'pages.User.column.userCode', defaultMessage: '用户编号' })}
+            rules={[]}
+          >
+            <Input disabled={true} />
+          </Form.Item>
+
+          <Form.Item
+            name="userName"
+            label={formatMessage({ id: 'pages.User.column.userName', defaultMessage: '用户姓名' })}
+            rules={[
+              {
+                required: true,
+                message: formatMessage({ id: 'pages.User.column.userName', defaultMessage: '用户姓名' }),
+              },
+            ]}
+          >
+            <Input />
+
+            {/* <a onClick={() => { this.handleEditMutilLan("user_name") }}>
+                <FormattedMessage id="multilang.edit.form.title" defaultMessage="编辑多语言" />
+              </a> */}
+          </Form.Item>
+          <Form.Item>
+            <Button
+              type="link"
+              onClick={() => {
+                handleEditMutilLan();
+              }}
+            >
+              {formatMessage({ id: 'cfmmUI.multilang.edit.form.title', defaultMessage: '编辑多语言' })}
+            </Button>
+          </Form.Item>
+          <Form.Item name="nickName" label={formatMessage({ id: 'pages.User.column.nickName' })}>
+            <Input />
+          </Form.Item>
+          <Form.Item name="phone" label={formatMessage({ id: 'pages.User.column.phone' })}>
+            <Input />
+          </Form.Item>
+
+          <Form.Item name="email" label={formatMessage({ id: 'pages.User.column.email' })}>
+            <Input />
+          </Form.Item>
+          <Form.Item name="sex" label={formatMessage({ id: 'pages.User.column.sex' })}>
+            <Select style={{ maxWidth: 220 }}>
+              <Option value="female">
+                {formatMessage({ id: 'pages.User.column.sex.female', defaultMessage: '女' })}
+              </Option>
+              <Option value="male">{formatMessage({ id: 'pages.User.column.sex.male', defaultMessage: '男' })}</Option>
+            </Select>
+          </Form.Item>
+          <Form.Item name="remark" label={formatMessage({ id: 'pages.User.column.remark' })}>
+            <Input.TextArea rows={4} />
+          </Form.Item>
+          <Form.Item>
+            <Button htmlType="submit" type="primary">
+              {formatMessage({ id: 'accountandsettings.basic.update', defaultMessage: 'Update Information' })}
+            </Button>
+          </Form.Item>
+        </Form>
+      </div>
+      <div className={styles.right}>
+        <AvatarView avatar={getAvatarURL()} userCode={currentUser?.userCode} />
+      </div>
+      <EditMultiLangForm
+        modalFormVisible={modalFormVisible}
+        setModalFormVisible={handleModalFormVisible}
+        values={langInfoItem}
+      ></EditMultiLangForm>
+    </div>
+  );
+};
+
+export default BaseView;

package/lib/templates/qiankun/cf-workbench-base/src/pages/System/AccountandSettings/components/changePassword.tsx

@@ -0,0 +1,106 @@
+import { Button, Form, Input, Modal, message } from 'antd';
+import React, { Fragment } from 'react';
+
+import { ChangePasswordItem } from '@/pages/System/User/data';
+import { updateUserPassword } from '@/pages/System/User/service';
+import { useIntl, useModel } from '@umijs/max';
+
+const confirm = Modal.confirm;
+
+const ChangePassword: React.FC = () => {
+  const { currentUser } = useModel('user');
+  const { logout } = useModel('login');
+
+  const { formatMessage } = useIntl();
+
+  const onFinish = async (values: ChangePasswordItem) => {
+    if (values.password !== values.confirmPassword) {
+      message.error(
+        formatMessage({
+          id: 'accountandsettings.changePassword.pssword.notEqual.message',
+          defaultMessage: '请确认新密码',
+        }),
+      );
+
+      return;
+    }
+
+    confirm({
+      title: formatMessage({
+        id: 'accountandsettings.changePassword.confirm.Message',
+        defaultMessage: '修改密码确认',
+      }),
+      content: formatMessage({
+        id: 'accountandsettings.changePassword.confirm.Content',
+        defaultMessage: '请确认你的操作，操作完成后将无法撤消，如遇问题请与管理员联系。',
+      }),
+      onOk: async (e) => {
+        const result = await updateUserPassword({ userCode: currentUser.userCode, password: values.password });
+
+        if (result && result.code == 200) {
+          message.success(
+            formatMessage({
+              id: 'accountandsettings.changePassword.success.Message',
+              defaultMessage: '修改密码成功',
+            }),
+          );
+
+          //refresh data
+          logout();
+        }
+      },
+      onCancel() {},
+    });
+  };
+
+  return (
+    <Fragment>
+      <Form labelCol={{ span: 4 }} wrapperCol={{ span: 14 }} onFinish={onFinish} autoComplete="off">
+        <Form.Item
+          label={formatMessage({
+            id: 'accountandsettings.changePassword.password',
+            defaultMessage: '新密码',
+          })}
+          name="password"
+          rules={[
+            {
+              required: true,
+              message: formatMessage({
+                id: 'accountandsettings.changePassword.password.requireMessage',
+                defaultMessage: '请输入新密码',
+              }),
+            },
+          ]}
+        >
+          <Input.Password />
+        </Form.Item>
+
+        <Form.Item
+          label={formatMessage({
+            id: 'accountandsettings.changePassword.confirmPssword',
+            defaultMessage: '确认新密码',
+          })}
+          name="confirmPassword"
+          rules={[
+            {
+              required: true,
+              message: formatMessage({
+                id: 'accountandsettings.changePassword.confirmPssword.requireMessage',
+                defaultMessage: '请确认新密码',
+              }),
+            },
+          ]}
+        >
+          <Input.Password />
+        </Form.Item>
+        <Form.Item wrapperCol={{ offset: 8, span: 16 }}>
+          <Button type="primary" htmlType="submit">
+            {formatMessage({ id: 'common.pages.updateForm.submit.button.text', defaultMessage: '提交' })}
+          </Button>
+        </Form.Item>
+      </Form>
+    </Fragment>
+  );
+};
+
+export default ChangePassword;