@qqt-product/system 0.0.1 → 0.0.16

package/src/lib/components/QAccountList/src/QAccountDetail.vue

@@ -5,14 +5,25 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive } from 'vue'
+//JS
+import { ref, reactive, inject } from 'vue'
+import { useRefInstanceHook } from '@qqt-product/ui'
+
+//ts
+import * as customConfigEdits from '../../../utils/global.types'
 import type { ComponentPublicInstance } from 'vue'
 import type { GlobalPageLayoutTypes } from '@qqt-product/ui'
+
 // 传参 props
 const props = defineProps<{
   currentRow: GlobalPageLayoutTypes.CurrentRow | null
   userInfo: GlobalPageLayoutTypes.UserInfo
 }>()
+//state
+
+const qHttp = inject(customConfigEdits.INJECT_HTTP) as customConfigEdits.HttpClient
+let optionall = ref([])
+let groupOptions = ref([])
 const currentRow = props.currentRow
   ? props.currentRow
   : ref({
@@ -25,7 +36,7 @@ const currentRow = props.currentRow
     })
 // 编辑组件 ref
 const layoutRef = ref<ComponentPublicInstance | null>(null)
-
+const { pageData } = useRefInstanceHook(layoutRef)
 // 配置
 const options = reactive<Partial<GlobalPageLayoutTypes.EditPageLayoutProps>>({
   /**
@@ -60,20 +71,12 @@ const options = reactive<Partial<GlobalPageLayoutTypes.EditPageLayoutProps>>({
       { groupCode: 'baseForm', fieldType: 'input', fieldLabel: 'ELS账号', fieldLabelI18nKey: 'i18n_title_ELSAccount', fieldName: 'elsAccount', placeholder: 'ELS账号', disabled: true },
       { groupCode: 'baseForm', fieldType: 'input', fieldLabel: '子账号', fieldLabelI18nKey: 'i18n_field_subAccount', fieldName: 'subAccount', required: '1' },
       { groupCode: 'baseForm', fieldType: 'input', fieldLabel: '姓名', fieldLabelI18nKey: 'i18n_title_name', fieldName: 'realname', required: '1' },
-      {
-        groupCode: 'baseForm',
-        fieldType: 'input',
-        fieldLabel: '密码',
-        fieldLabelI18nKey: 'i18n_title_password',
-        fieldName: 'password',
-        required: '1',
-      },
       {
         groupCode: 'baseForm',
         fieldType: 'remoteSelect',
         fieldLabel: '角色',
         fieldLabelI18nKey: 'i18n_title_role',
-        fieldName: 'selectedroles',
+        fieldName: 'selectedroles_dictText',
         extend: {
           modalColumns: [{ field: 'roleName', title: '角色', with: 150 }],
           modalUrl: '/account/role/queryall',
@@ -86,7 +89,7 @@ const options = reactive<Partial<GlobalPageLayoutTypes.EditPageLayoutProps>>({
         fieldType: 'remoteSelect',
         fieldLabel: '数据权限组',
         fieldLabelI18nKey: 'i18n_menu_WFbWV_c4394039',
-        fieldName: 'selectedGroups',
+        fieldName: 'selectedGroups_dictText',
         extend: {
           modalColumns: [{ field: 'groupName', title: '数据权限组', with: 150 }],
           modalUrl: '/account/permissionGroup/queryAll',
@@ -134,13 +137,13 @@ const options = reactive<Partial<GlobalPageLayoutTypes.EditPageLayoutProps>>({
               field: 'subAccount',
               fieldLabelI18nKey: 'i18n_field_subAccount',
               title: '子账号',
-              with: 150,
+              width: 150,
             },
             {
               field: 'realname',
               fieldLabelI18nKey: 'i18n_title_name',
               title: '姓名',
-              with: 150,
+              width: 150,
             },
           ],
           modalUrl: '/account/elsSubAccount/list',
@@ -188,4 +191,69 @@ const options = reactive<Partial<GlobalPageLayoutTypes.EditPageLayoutProps>>({
     ],
   },
 })
+
+function onMouteds() {
+  getOptions()
+  getGroupOptions()
+  setTimeout(() => {
+    let selectedroles = pageData.value.selectedroles as string
+    let selectId = selectedroles.split(',')
+    let selectRoleName = selectId.map((val) => {
+      let optionallSingle: any = optionall.value.find((vals: customConfigEdits.MapObjectNoneType) => {
+        return vals.id == val
+      })
+      return optionallSingle.title
+    })
+
+    console.log('optionall', selectRoleName)
+    pageData.value.selectedroles_dictText = selectRoleName.join(',')
+    let selectedGroups = pageData.value.selectedGroups as string
+    let selectGroupId = selectedGroups ? selectedGroups.split(',') : []
+    let selectGroupName = selectGroupId.map((val) => {
+      let groupOptionsSigle = {} as any | undefined
+      groupOptionsSigle = groupOptions.value.find((vals: customConfigEdits.MapObjectNoneType) => {
+        return vals.id == val
+      })
+      return groupOptionsSigle && groupOptionsSigle.title ? groupOptionsSigle.title : ''
+    })
+    console.log('selectGroupName', groupOptions.value)
+    pageData.value.selectedGroups_dictText = selectGroupName.join(',')
+  }, 2000)
+}
+
+onMouteds()
+
+function getOptions() {
+  return qHttp
+    .get({
+      url: '/account/role/queryall',
+    })
+    .then((res) => {
+      let result = res.result || []
+      optionall.value = result.map((item) => {
+        return {
+          ...item,
+          title: item.roleName,
+          value: item.id,
+        }
+      })
+    })
+}
+
+function getGroupOptions() {
+  qHttp
+    .get({
+      url: '/account/permissionGroup/queryAll',
+    })
+    .then((res) => {
+      let result = res.result || []
+      groupOptions.value = result.map((item) => {
+        return {
+          ...item,
+          title: item.groupName,
+          value: item.id,
+        }
+      })
+    })
+}
 </script>

package/src/lib/components/QAccountList/src/QAccountEdit.vue

@@ -1,24 +1,28 @@
 <template>
   <div class="edit-page">
     <a-spin :spinning="customLoading">
-      <q-edit-page-layout ref="layoutRef" v-bind="options" @customSave="handleCustomSave" @validate-success="handleValidateSuccess" @refresh="handleRefresh"></q-edit-page-layout>
+      <q-edit-page-layout v-if="showEdit" ref="layoutRef" v-bind="options" @customSave="handleCustomSave" @validate-success="handleValidateSuccess"></q-edit-page-layout>
     </a-spin>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref, reactive } from 'vue'
+import { ref, reactive, onMounted, inject, shallowRef, nextTick } from 'vue'
 import type { ComponentPublicInstance } from 'vue'
 import { BUTTON_ADD_ONE_ROW, BUTTON_DELETE_ROW, BUTTON_SAVE } from '@qqt-product/ui'
 // ui组件库 types
 import type { GlobalPageLayoutTypes } from '@qqt-product/ui'
 import { usePromiseStepHook, useRefInstanceHook } from '@qqt-product/ui'
+import * as customConfigEdits from '../../../utils/global.types'
 
 // 传参 props
 const props = defineProps<{
   currentRow: GlobalPageLayoutTypes.CurrentRow | null
   userInfo: GlobalPageLayoutTypes.UserInfo
 }>()
+
+const qHttp = inject(customConfigEdits.INJECT_HTTP) as customConfigEdits.HttpClient
+const showEdit = shallowRef(false)
 const currentRow = props.currentRow
   ? props.currentRow
   : ref({
@@ -33,6 +37,10 @@ const currentRow = props.currentRow
 const layoutRef = ref<ComponentPublicInstance | null>(null)
 
 // 配置
+
+const roleOptains = ref([])
+const groupOptains = ref([])
+
 const options = reactive<Partial<GlobalPageLayoutTypes.EditPageLayoutProps>>({
   /**
    * 模块业务类型 string
@@ -78,36 +86,20 @@ const options = reactive<Partial<GlobalPageLayoutTypes.EditPageLayoutProps>>({
       { groupCode: 'baseForm', fieldType: 'input', fieldLabel: '姓名', fieldLabelI18nKey: 'i18n_title_name', fieldName: 'realname', required: '1' },
       {
         groupCode: 'baseForm',
-        fieldType: 'input',
-        fieldLabel: '密码',
-        fieldLabelI18nKey: 'i18n_title_password',
-        fieldName: 'password',
-        required: '1',
-      },
-      {
-        groupCode: 'baseForm',
-        fieldType: 'remoteSelect',
+        fieldType: 'multiple',
         fieldLabel: '角色',
         fieldLabelI18nKey: 'i18n_title_role',
         fieldName: 'selectedroles',
-        extend: {
-          modalColumns: [{ field: 'roleName', title: '角色', with: 150 }],
-          modalUrl: '/account/role/queryall',
-          selectModel: 'single',
-        },
         required: '1',
+        options: roleOptains,
       },
       {
         groupCode: 'baseForm',
-        fieldType: 'remoteSelect',
+        fieldType: 'multiple',
         fieldLabel: '数据权限组',
         fieldLabelI18nKey: 'i18n_menu_WFbWV_c4394039',
         fieldName: 'selectedGroups',
-        extend: {
-          modalColumns: [{ field: 'groupName', title: '数据权限组', with: 150 }],
-          modalUrl: '/account/permissionGroup/queryAll',
-          selectModel: 'single',
-        },
+        options: groupOptains,
       },
       {
         groupCode: 'baseForm',
@@ -131,11 +123,17 @@ const options = reactive<Partial<GlobalPageLayoutTypes.EditPageLayoutProps>>({
       { groupCode: 'baseForm', fieldType: 'input', fieldLabel: '座机号', fieldLabelI18nKey: 'i18n_title_landlineNumber', fieldName: 'telephone' },
       {
         groupCode: 'baseForm',
-        fieldType: 'select',
+        fieldType: 'treeSelect',
         fieldLabel: '部门',
         fieldLabelI18nKey: 'i18n_title_department',
         dictCode: '/org/purchaseOrganizationInfo/getOrgTree',
         fieldName: 'orgCode',
+        placeholder: '请选择部门',
+        extend: {
+          params: { parentId: '0' },
+          fieldNames: { children: 'children', label: 'title', value: 'value' },
+          multiple: true,
+        },
       },
       { groupCode: 'baseForm', fieldType: 'date', fieldLabel: '账号过期时间', fieldLabelI18nKey: 'i18n_title_accountExpirationTime', fieldName: 'accountValidityDate' },
       {
@@ -150,17 +148,21 @@ const options = reactive<Partial<GlobalPageLayoutTypes.EditPageLayoutProps>>({
               field: 'subAccount',
               fieldLabelI18nKey: 'i18n_field_subAccount',
               title: '子账号',
-              with: 150,
+              width: 150,
             },
             {
               field: 'realname',
               fieldLabelI18nKey: 'i18n_title_name',
               title: '姓名',
-              with: 150,
+              width: 150,
             },
           ],
           modalUrl: '/account/elsSubAccount/list',
         },
+        callback(ctx, { data, pageData }) {
+          if (!data?.length) return
+          pageData.superiorLeader = data[0].subAccount + '_' + data[0].realname
+        },
       },
     ],
     itemColumns: [
@@ -216,11 +218,9 @@ const options = reactive<Partial<GlobalPageLayoutTypes.EditPageLayoutProps>>({
     },
   ],
 })
-const pageButtons = options.pageButtons as GlobalPageLayoutTypes.PageButton[]
-const refreshMethods = options.refreshMethods
 
 const { pageData, layoutConfig, defaultValues } = useRefInstanceHook(layoutRef)
-const { stepTriggerValidate, composeSave, customLoading } = usePromiseStepHook({ pageData, layoutConfig, defaultValues, pageButtons: ref(pageButtons), refreshMethods })
+const { stepTriggerValidate, composeSave, customLoading } = usePromiseStepHook({ pageData, layoutConfig, defaultValues, options })
 // 自定义保存
 const handleCustomSave = () => {
   stepTriggerValidate()
@@ -231,11 +231,43 @@ const handleValidateSuccess = (button: GlobalPageLayoutTypes.PageButton) => {
     composeSave()
   }
 }
+
 // 页面刷新
-const handleRefresh = () => {
-  console.log('refresh :>> ')
-  if (options.currentRow) {
-    options.currentRow._t = +new Date()
-  }
+
+function getRoleOptains() {
+  return qHttp
+    .get({
+      url: '/account/role/queryall',
+    })
+    .then((res) => {
+      let result = res.result || []
+      roleOptains.value = result.map((item) => ({
+        label: item.roleName,
+        value: item.id,
+      }))
+    })
 }
+function getGroupOptains() {
+  return qHttp
+    .get({
+      url: '/account/permissionGroup/queryAll',
+    })
+    .then((res) => {
+      let result = res.result || []
+      groupOptains.value = result.map((item) => ({
+        ...item,
+        label: item.groupName,
+        value: item.id,
+      }))
+    })
+}
+
+//生命周期
+onMounted(async () => {
+  await getRoleOptains()
+  await getGroupOptains()
+  await nextTick(() => {
+    showEdit.value = true
+  })
+})
 </script>