@utogether/udp-core 1.0.1-beta.9 → 1.0.2

package/src/views/system/role-assign/RolePanel.vue

@@ -1,139 +1,139 @@
-<template>
-  <div v-spinning="data.loading" class="page-content">
-    <ut-grid
-      ref="xgrid"
-      :items="formItems"
-      :columns="gridCol"
-      :default-params="data.fetchExtParam"
-      :default-value="data.fetchExtParam"
-      :buttons="buttons"
-      :auto-load="false"
-      :url="url"
-      :check-method="checkMethod"
-      mode="form"
-      @buttonClick="onButtonClick"
-    />
-    <ut-modal-grid
-      v-if="data.showModalView"
-      ref="xmodal"
-      :items="formItems"
-      :columns="columns"
-      :show-footer="true"
-      :editable="false"
-      :title="$t('message.udp.roleList')"
-      url="/uums/role"
-      width="60%"
-      height="75%"
-      @close="data.showModalView = false"
-      @confirm="onConfirm"
-    />
-  </div>
-</template>
-
-<script setup lang="tsx">
-import { useI18n } from 'vue-i18n';
-import { ref, reactive, watch, inject, nextTick } from 'vue';
-import { clone } from 'xe-utils';
-import { VxeUI } from 'vxe-pc-ui';
-import to from 'await-to-js';
-import { successMessage } from '@utogether/utils';
-import { getServiceApi } from '../../../api';
-
-const data = reactive<IRecord>({
-  record: {},
-  loading: false,
-  showModalView: false
-});
-const { t } = useI18n();
-
-const xgrid = ref(null);
-const xmodal = ref(null);
-const active: IRecord = inject('active');
-
-const url = '/uums/orgRole';
-watch(
-  () => active.value,
-  () => {
-    if (!active?.value.id) return;
-    data.fetchExtParam = { orgId: active?.value.id };
-    nextTick(() => {
-      xgrid.value.refreshData();
-    });
-  }
-);
-
-const buttons = [{ code: 'del', auth: '/' }];
-
-const formItems = [
-  { field: 'roleName', title: 'message.udp.roleName', span: 9 },
-  { field: 'roleCode', title: 'message.udp.roleCode', span: 9 }
-];
-
-const columns = [
-  { type: 'checkbox', width: 40 },
-  { field: 'roleCode', title: 'message.udp.roleCode' },
-  { field: 'roleName', title: 'message.udp.roleName' },
-  { field: 'roleDesc', title: 'message.udp.roleDesc' },
-  { field: 'enabled', width: 100, formatter: ['formatDict', 'SU.ENABLE'] }
-];
-
-const gridCol: any[] = clone(columns, true);
-gridCol.push({
-  field: 'operate',
-  width: 80,
-  fixed: 'right',
-  slots: {
-    default: ({ row }) => {
-      if (row.roleCode === 'admin') return null;
-      return [
-        <ut-button icon="ri-delete-bin-5-fill" content="del" status="danger" auth="del" onTap={() => handleDel(row)} />
-      ];
-    }
-  }
-});
-
-// 新增
-const handleAdd = () => {
-  data.record = {};
-  data.record.orgId = active.value.id;
-  data.showModalView = true;
-};
-// 删除
-const handleDel = async row => {
-  const type = await VxeUI.modal.confirm(t('message.tip.del'));
-  if (type === 'confirm') {
-    const param = { orgId: active.value.id, roleId: row.id };
-    data.loading = true;
-    const [err] = await to(getServiceApi().delete(url, param));
-    if (!err) {
-      successMessage(t('message.operateSuccess'));
-    }
-    xgrid.value.refreshData();
-    data.loading = false;
-  }
-};
-const onConfirm = async records => {
-  const orgRoleList = [];
-  records.forEach(m => {
-    m.orgId = active.value.id;
-    m.roleId = m.id;
-    orgRoleList.push(m);
-  });
-  const param = { orgRoleList };
-  xmodal.value.showLoading();
-  const [err] = await to(getServiceApi().post(url, param));
-  if (!err) {
-    successMessage();
-    xgrid.value.refreshData();
-    data.showModalView = false;
-  }
-};
-
-const checkMethod = row => {
-  return row.roleCode !== 'admin';
-};
-
-const onButtonClick = code => {
-  code === 'add' && handleAdd();
-};
-</script>
+<template>
+  <div v-spinning="data.loading" class="page-content">
+    <ut-grid
+      ref="xgrid"
+      :items="formItems"
+      :columns="gridCol"
+      :default-params="data.fetchExtParam"
+      :default-value="data.fetchExtParam"
+      :buttons="buttons"
+      :auto-load="false"
+      :url="url"
+      :check-method="checkMethod"
+      mode="form"
+      @buttonClick="onButtonClick"
+    />
+    <ut-modal-grid
+      v-if="data.showModalView"
+      ref="xmodal"
+      :items="formItems"
+      :columns="columns"
+      :show-footer="true"
+      :editable="false"
+      :title="$t('message.udp.roleList')"
+      url="/uums/role"
+      width="60%"
+      height="75%"
+      @close="data.showModalView = false"
+      @confirm="onConfirm"
+    />
+  </div>
+</template>
+
+<script setup lang="tsx">
+import { useI18n } from 'vue-i18n';
+import { ref, reactive, watch, inject, nextTick } from 'vue';
+import { clone } from 'xe-utils';
+import { VxeUI } from 'vxe-pc-ui';
+import to from 'await-to-js';
+import { successMessage } from '@utogether/utils';
+import { getServiceApi } from '../../../api';
+
+const data = reactive<IRecord>({
+  record: {},
+  loading: false,
+  showModalView: false
+});
+const { t } = useI18n();
+
+const xgrid = ref(null);
+const xmodal = ref(null);
+const active: IRecord = inject('active');
+
+const url = '/uums/orgRole';
+watch(
+  () => active.value,
+  () => {
+    if (!active?.value.id) return;
+    data.fetchExtParam = { orgId: active?.value.id };
+    nextTick(() => {
+      xgrid.value.refreshData();
+    });
+  }
+);
+
+const buttons = [{ code: 'del', auth: '/' }];
+
+const formItems = [
+  { field: 'roleName', title: 'message.udp.roleName', span: 9 },
+  { field: 'roleCode', title: 'message.udp.roleCode', span: 9 }
+];
+
+const columns = [
+  { type: 'checkbox', width: 40 },
+  { field: 'roleCode', title: 'message.udp.roleCode' },
+  { field: 'roleName', title: 'message.udp.roleName' },
+  { field: 'roleDesc', title: 'message.udp.roleDesc' },
+  { field: 'enabled', width: 100, formatter: ['formatDict', 'SU.ENABLE'] }
+];
+
+const gridCol: any[] = clone(columns, true);
+gridCol.push({
+  field: 'operate',
+  width: 80,
+  fixed: 'right',
+  slots: {
+    default: ({ row }) => {
+      if (row.roleCode === 'admin') return null;
+      return [
+        <ut-button icon="ri-delete-bin-5-fill" content="del" status="danger" auth="del" onTap={() => handleDel(row)} />
+      ];
+    }
+  }
+});
+
+// 新增
+const handleAdd = () => {
+  data.record = {};
+  data.record.orgId = active.value.id;
+  data.showModalView = true;
+};
+// 删除
+const handleDel = async row => {
+  const type = await VxeUI.modal.confirm(t('message.tip.del'));
+  if (type === 'confirm') {
+    const param = { orgId: active.value.id, roleId: row.id };
+    data.loading = true;
+    const [err] = await to(getServiceApi().delete(url, param));
+    if (!err) {
+      successMessage(t('message.operateSuccess'));
+    }
+    xgrid.value.refreshData();
+    data.loading = false;
+  }
+};
+const onConfirm = async records => {
+  const orgRoleList = [];
+  records.forEach(m => {
+    m.orgId = active.value.id;
+    m.roleId = m.id;
+    orgRoleList.push(m);
+  });
+  const param = { orgRoleList };
+  xmodal.value.showLoading();
+  const [err] = await to(getServiceApi().post(url, param));
+  if (!err) {
+    successMessage();
+    xgrid.value.refreshData();
+    data.showModalView = false;
+  }
+};
+
+const checkMethod = row => {
+  return row.roleCode !== 'admin';
+};
+
+const onButtonClick = code => {
+  code === 'add' && handleAdd();
+};
+</script>

package/src/views/system/sys/sys-config.vue

@@ -1,20 +1,7 @@
 <template>
-  <div v-spinning="loading" class="flex flex-col items-center bg-white u-system-config">
-    <div class="flex justify-end w-1/2 p-2">
-      <el-button type="primary" @click="submitForm(xfrom)">
-        {{ $t('message.btn.confirm') }}
-      </el-button>
-    </div>
-    <div class="flex w-1/2 p-2 overflow-y-auto border border-gray-300 rounded-md">
-      <el-form
-        ref="xfrom"
-        :model="record"
-        :rules="rules"
-        label-width="90"
-        size="small"
-        status-icon
-        class="w-full"
-      >
+  <div v-spinning="loading" class="flex flex-col items-center pt-20 bg-white u-system-config">
+    <div class="flex w-1/2 p-3 overflow-y-auto border border-gray-300 rounded-md">
+      <el-form ref="xfrom" :model="record" :rules="rules" label-width="90" size="small" status-icon class="w-full">
         <el-form-item :label="$t('message.udp.systemTitle')" prop="title">
           <el-input v-model="record.title" />
         </el-form-item>
@@ -33,6 +20,26 @@
         <el-form-item :label="$t('message.udp.i18nEnabled')" prop="i18nEnabled">
           <el-switch v-model="record.i18nEnabled" active-value="Y" inactive-value="N" />
         </el-form-item>
+        <el-form-item :label="$t('message.udp.orgTaggle')" prop="orgTaggle">
+          <el-switch v-model="record.orgTaggle" active-value="Y" inactive-value="N" />
+        </el-form-item>
+        <el-form-item :label="$t('message.udp.showTitle')" prop="showTitle">
+          <el-switch v-model="record.showTitle" active-value="Y" inactive-value="N" />
+        </el-form-item>
+        <el-form-item
+          v-if="['liwei', 'yanhuaijun', 'phr', 'zhonglijun', 'ccl'].includes(cookies.get(kLOGINER))"
+          :label="$t('message.udp.techSupport')"
+          prop="techSupport"
+        >
+          <el-switch v-model="record.techSupport" active-value="Y" inactive-value="N" />
+        </el-form-item>
+        <el-form-item
+          v-if="['liwei', 'yanhuaijun', 'phr', 'zhonglijun', 'ccl'].includes(cookies.get(kLOGINER))"
+          :label="$t('message.udp.baseColor')"
+          prop="baseColor"
+        >
+          <vxe-color-picker v-model="record.baseColor" :colors="colorList" type="hex" clearable transfer />
+        </el-form-item>
         <el-form-item :label="$t('message.udp.systemLogo')">
           <el-upload
             v-model:file-list="record.logo"
@@ -100,6 +107,11 @@
         </el-form-item>
       </el-form>
     </div>
+    <div class="flex justify-end w-1/2 p-2">
+      <el-button type="primary" @click="submitForm(xfrom)">
+        {{ $t('message.btn.confirm') }}
+      </el-button>
+    </div>
   </div>
 </template>
 
@@ -110,7 +122,7 @@ import { useI18n } from 'vue-i18n';
 import to from 'await-to-js';
 import { successMessage, cookies, warnMessage } from '@utogether/utils';
 import { isArray } from 'xe-utils';
-import { kTOKEN } from '../../../contant';
+import { kTOKEN, kLOGINER } from '../../../contant';
 import { getServiceApi, getBaseURL } from '../../../api';
 
 const xfrom = ref<FormInstance>();
@@ -119,7 +131,11 @@ const record = reactive({
   defaultLanguage: 'zh',
   title: 'U-DP',
   ispTitle: 'U-DP',
+  baseColor: '#FFF',
   i18nEnabled: 'N',
+  orgTaggle: 'Y',
+  showTitle: 'Y',
+  techSupport: 'Y',
   copyright: '深圳友聚信息技术有限公司',
   logo: [],
   backgroundImg: [],
@@ -134,6 +150,39 @@ const baseUrl = ref(getBaseURL());
 const url = '/upfm/v1/sysConfig';
 let dataList = [];
 
+const colorList = [
+  '#DC143C',
+  '#FF1493',
+  '#FF00FF',
+  '#9932CC',
+  '#6A5ACD',
+  '#0000FF',
+  '#00008B',
+  '#778899',
+  '#1E90FF',
+  '#00BFFF',
+  '#5F9EA0',
+  '#00FFFF',
+  '#008080',
+  '#7FFFAA',
+  '#3CB371',
+  '#8FBC8F',
+  '#008000',
+  '#7CFC00',
+  '#556B2F',
+  '#FFFFE0',
+  '#FFFF00',
+  '#808000',
+  '#EEE8AA',
+  '#FFD700',
+  '#FFA500',
+  '#FF4500',
+  '#FA8072',
+  '#FF0000',
+  '#800000',
+  '#C0C0C0'
+];
+
 const rules = reactive<FormRules>({
   defaultLanguage: [
     {
@@ -142,9 +191,7 @@ const rules = reactive<FormRules>({
       trigger: 'blur'
     }
   ],
-  title: [
-    { required: true, message: t('message.required') + t('message.udp.systemTitle'), trigger: 'blur' }
-  ]
+  title: [{ required: true, message: t('message.required') + t('message.udp.systemTitle'), trigger: 'blur' }]
 });
 
 const headers = computed(() => {
@@ -266,6 +313,8 @@ onMounted(() => {
 </script>
 <style lang="scss">
 .u-system-config {
+  padding-top: 48px;
+
   .el-select,
   .el-select--small {
     width: 100%;

package/src/views/system/sysUser/SysUserPanel.vue

@@ -7,8 +7,8 @@
       :url="url"
       :auto-load="false"
       :default-params="defaultParams"
-      :default-value="defaultParams"
-      :events="onGridEvents"
+      mode="form"
+      @buttonClick="onButtonClick"
     />
     <!-- 编辑用户信息 -->
     <vxe-modal v-model="data.showModelView" title="用户信息" width="300">
@@ -72,6 +72,21 @@
         />
       </template>
     </vxe-modal>
+
+    <ut-modal-form
+      v-if="data.showModal"
+      :record="data.record"
+      :items="data.items"
+      :width="360"
+      :height="data.height"
+      :method="!data.record.id ? 'post' : 'put'"
+      :data-process-method="dataProcessMethod"
+      :title="$t('message.title.userInfo')"
+      data-status="update"
+      :url="url"
+      @close="data.showModal = false"
+      @confirm="onConfirm"
+    />
   </div>
 </template>
 
@@ -79,9 +94,9 @@
 import { useI18n } from 'vue-i18n';
 import { ref, reactive, inject, onMounted } from 'vue';
 import to from 'await-to-js';
-import { useRender, errorMessage, warnMessage, delay } from '@utogether/utils';
+import { useRender, errorMessage, warnMessage, delay, getDictChildren } from '@utogether/utils';
 import { VxeUI, VxeFormPropTypes } from 'vxe-pc-ui';
-import { isEmpty } from 'xe-utils';
+import { clone, isEmpty } from 'xe-utils';
 import { getServiceApi } from '../../../api';
 
 const data = reactive<IRecord>({
@@ -89,9 +104,11 @@ const data = reactive<IRecord>({
   listQuery: {},
   dataList: [],
   roleList: [],
+  items: [],
   submitLoading: false,
   showModelView: false,
   showUserRole: false,
+  showModal: false,
   showAuth: false,
   dataStatus: ''
 });
@@ -131,44 +148,37 @@ const treeList: IRecord[] = inject('treeList');
 const loading = ref(false);
 
 const url = '/uums/user';
+let defaultPassword = '';
 
 const xgrid = ref(null);
 
 const formItems = [
   { field: 'name', title: 'message.udp.userName' },
-  { field: 'userName', title: 'message.udp.userCode' }
+  { field: 'userName', title: 'message.udp.userCode' },
+  { field: 'type', title: 'message.udp.userType', code: 'SU.USER.TYPE' }
 ];
 
 const columns = [
   { type: 'checkbox', width: 40, align: 'center' },
-  { field: 'userName', title: 'message.udp.userCode', required: true, editRender: renderHook.renderInput() },
-  { field: 'name', title: 'message.udp.userName', required: true, editRender: renderHook.renderInput() },
+  { field: 'userName', title: 'message.udp.userCode' },
+  { field: 'name', title: 'message.udp.userName' },
   {
     field: 'type',
     title: 'message.udp.userType',
-    formatter: ['formatDict', 'SU.USER.TYPE'],
-    editRender: renderHook.renderDict('SU.USER.TYPE')
-  },
-  {
-    field: 'userPwd',
-    required: true,
-    width: 150,
-    editRender: renderHook.renderInput(),
-    formatter: () => '*******'
+    formatter: ['formatDict', 'SU.USER.TYPE']
   },
   { field: 'enabled', width: 80, cellRender: renderHook.renderEnabled(handleClick) },
   {
     field: 'operate',
-    width: 240,
+    width: 150,
     fixed: 'right',
     slots: {
       default: ({ row }) => {
-        if (!row.id) return null;
         return [
           <>
-            <ut-button icon="ri-user-fill" content="role" onTap={() => handleRole(row)} />
-            <ut-button icon="ri-lock-fill" content="auth" status="success" onTap={() => handleAuth(row)} />
-            <ut-button icon="ri-lock-fill" content="passwordReset" status="warning" onTap={() => handleResetPwd(row)} />
+            <ut-button content="edit" icon="ri-edit-line" onTap={() => handleEdit(row)} />
+
+            <ut-dropdown buttons={getButtons()} onCommand={code => handleCommand(row, code)} />
           </>
         ];
       }
@@ -176,6 +186,59 @@ const columns = [
   }
 ];
 
+const handleCommand = (row, code) => {
+  code === 'role' && handleRole(row);
+  code === 'auth' && handleAuth(row);
+  code === 'passwordReset' && handleResetPwd(row);
+};
+
+const getButtons = () => {
+  // 项目延期
+  const buttons = [
+    { code: 'role', icon: 'ri-user-fill' },
+    { code: 'auth', icon: 'ri-lock-fill' },
+    { code: 'passwordReset', icon: 'ri-lock-password-line' }
+  ];
+  return buttons;
+};
+
+const items = [
+  { field: 'userName', title: 'message.udp.userCode', required: true, disabled: false },
+  { field: 'name', title: 'message.udp.userName', required: true },
+  { field: 'type', required: true, title: 'message.udp.userType', code: 'SU.USER.TYPE' },
+  { field: 'userPwd', required: true, visibleMethod: ({ data }) => !data.id }
+];
+
+const handleAdd = () => {
+  data.record = {
+    userPwd: defaultPassword,
+    ...defaultParams.value,
+    type: 'system'
+  };
+  data.items = clone(items, true);
+  data.height = 280;
+  data.showModal = true;
+};
+const handleEdit = row => {
+  data.record = clone(row, true);
+  data.items = clone(items, true);
+  data.items[0].disabled = true;
+  data.height = 240;
+  data.showModal = true;
+};
+
+const handleDel = () => {
+  xgrid.value.getInstance().commitProxy('delete');
+};
+
+const dataProcessMethod = data => {
+  return [data];
+};
+
+const onConfirm = () => {
+  xgrid.value.refreshData();
+};
+
 // 启用/禁用
 async function handleClick({ row }) {
   await to(serviceApi.put(url, [row]));
@@ -204,7 +267,7 @@ const handleRole = async (row: any) => {
  */
 const handleResetPwd = async (row: Object) => {
   await serviceApi.put(url + '/resetPwd', row);
-  await VxeUI.modal.alert(t('message.tip.initPassword'));
+  await VxeUI.modal.alert(t('message.tip.initPassword', { code: defaultPassword }));
 };
 // 启用/禁用
 // const handleUpdate = async (record: IRecord) => {
@@ -233,12 +296,6 @@ const handleAuth = async row => {
   }
 };
 
-const onGridEvents = {
-  editActived({ row }) {
-    columns[1].editRender.props.disabled = !!row.id;
-    columns[4].editRender.props.disabled = !!row.id;
-  }
-};
 const xForm = ref(null);
 // const xSarchFrom = ref(null);
 
@@ -259,6 +316,12 @@ const onSubmit = () => {
 const handleClose = () => {
   data.showModelView = false;
 };
+
+const onButtonClick = code => {
+  code === 'add' && handleAdd();
+  code === 'del' && handleDel();
+};
+
 const getUnitList = () => {
   serviceApi
     .get('/uums/unit', { pageSize: 10 })
@@ -272,7 +335,13 @@ const getUnitList = () => {
     });
 };
 
+const getDefaultPassword = () => {
+  const dict = getDictChildren('SU.DEFAULT_PASSWORD')?.find(f => f.dictCode === 'default');
+  defaultPassword = dict.dictName;
+};
+
 onMounted(() => {
+  getDefaultPassword();
   getUnitList();
 });
 </script>