From 31ddc06ba900fa77bbebea528934c60066e86286 Mon Sep 17 00:00:00 2001
From: likunming <likunming@163.com>
Date: Thu, 27 Feb 2025 09:58:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/grid/ts/function/Criteria.ts   |  11 +-
 .../components/select/WUserSelect.vue         | 132 ++++++++++++------
 .../src/views/likm/Form.vue                   |   3 +
 .../src/views/likm/Grid.vue                   |  71 ++--------
 4 files changed, 108 insertions(+), 109 deletions(-)

diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/Criteria.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/Criteria.ts
index f939eb34..7d94b099 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/Criteria.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/Criteria.ts
@@ -99,9 +99,14 @@ export class Criteria extends Base {
               (!Tools.isEmpty(queryFormData[item]) && !Array.isArray(queryFormData[item])) ||
               (!Tools.isEmpty(queryFormData[item]) && Array.isArray(queryFormData[item]) && queryFormData[item].length > 0)
             ) {
-              // 根据数据进行operator处理
-              const criteria = this.buildCriteria(queryFormData[item], item);
-              urlSearchParams.append('criteria', JSON.stringify(criteria));
+              if (
+                (this.queryFormFields[item]['type'] === 'w-date-range' && !Tools.isEmpty(queryFormData[item]['from'])) ||
+                this.queryFormFields[item]['type'] !== 'w-date-range'
+              ) {
+                // 根据数据进行operator处理
+                const criteria = this.buildCriteria(queryFormData[item], item);
+                urlSearchParams.append('criteria', JSON.stringify(criteria));
+              }
             }
           });
         });
diff --git a/io.sc.platform.core.frontend/src/platform/components/select/WUserSelect.vue b/io.sc.platform.core.frontend/src/platform/components/select/WUserSelect.vue
index 3dc9b6f0..d1cbd6de 100644
--- a/io.sc.platform.core.frontend/src/platform/components/select/WUserSelect.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/select/WUserSelect.vue
@@ -26,51 +26,92 @@
         <q-btn v-if="!Tools.isEmpty(displayValueComputed)" flat square unelevated dense icon="cancel" @click="fieldMethodsClass.clearValue"></q-btn>
         <q-btn flat square unelevated dense icon="person_search">
           <q-popup-proxy v-model:model-value="isShow" anchor="bottom right" self="top right" :offset="[0, 10]">
-            <q-splitter v-model="leftWidthRef" style="width: 800px; height: 300px; position: relative">
+            <q-splitter v-model="leftWidthRef" style="width: 900px; height: 400px; position: relative">
               <template #before>
-                <w-grid
-                  ref="orgGridRef"
-                  :dense="true"
-                  :tree="true"
-                  :fetch-data-url="Environment.apiContextPath('/api/system/org')"
-                  :config-button="false"
-                  :checkbox-selection="false"
-                  db-click-operation="expand"
-                  :columns="[{ name: 'name', label: $t('org') }]"
-                  @row-click="orgRowClick"
-                >
-                </w-grid>
+                <q-list>
+                  <!-- 机构 -->
+                  <q-expansion-item icon="account_tree" label="机构">
+                    <q-card class="p-0">
+                      <q-card-section class="p-0">
+                        <w-grid
+                          ref="orgGridRef"
+                          :dense="true"
+                          :tree="true"
+                          :height="250"
+                          :hide-header="true"
+                          separator="none"
+                          :fetch-data-url="Environment.apiContextPath('/api/system/org')"
+                          :config-button="false"
+                          :checkbox-selection="true"
+                          db-click-operation="expand"
+                          :columns="[{ name: 'name', label: $t('org') }]"
+                          @row-click="orgRowClick"
+                          @update-ticked="orgUpdateTicked"
+                        >
+                        </w-grid>
+                      </q-card-section>
+                    </q-card>
+                  </q-expansion-item>
+                  <q-separator />
+
+                  <!-- 角色 -->
+                  <q-expansion-item icon="person" label="角色">
+                    <q-card class="p-0">
+                      <q-card-section class="p-0">
+                        <w-grid
+                          ref="roleGridRef"
+                          :dense="true"
+                          :height="250"
+                          separator="none"
+                          :fetch-data-url="Environment.apiContextPath('/api/system/role')"
+                          :config-button="false"
+                          :checkbox-selection="true"
+                          db-click-operation="expand"
+                          :columns="[
+                            { name: 'code', label: $t('code') },
+                            { name: 'name', label: $t('org') },
+                          ]"
+                          @row-click="orgRowClick"
+                        >
+                        </w-grid>
+                      </q-card-section>
+                    </q-card>
+                  </q-expansion-item>
+                  <q-separator />
+                </q-list>
               </template>
               <template #after>
-                <w-grid
-                  ref="userGridRef"
-                  :checkbox-selection="props.multiple || false"
-                  :dense="true"
-                  :fetch-data-url="userGridFetchDataUrl"
-                  :config-button="false"
-                  title="用户列表"
-                  :sort-by="['loginName']"
-                  :query-form-cols-num="2"
-                  :query-form-fields="[
-                    { name: 'loginName', label: $t('loginName'), type: 'w-text' },
-                    { name: 'userName', label: $t('userName'), type: 'w-text' },
-                  ]"
-                  :toolbar-actions="['query', 'separator', 'reset']"
-                  :ticked-record="{
-                    columnName: valueUseColumnName,
-                    data: typeof modelValue === 'string' ? [modelValue] : modelValue,
-                  }"
-                  :columns="[
-                    { name: 'loginName', label: $t('loginName') },
-                    { name: 'userName', label: $t('userName') },
-                    { name: 'description', label: $t('description') },
-                    { name: 'enable', label: $t('status'), format: Formater.enableTag() },
-                  ]"
-                  @row-click="userRowClick"
-                  @update-ticked="updateTicked"
-                  @update-tickeds="updateTickeds"
-                >
-                </w-grid>
+                <div class="h-full pl-1">
+                  <w-grid
+                    ref="userGridRef"
+                    :checkbox-selection="props.multiple || false"
+                    :dense="true"
+                    :fetch-data-url="userGridFetchDataUrl"
+                    :config-button="false"
+                    title="用户列表"
+                    :sort-by="['loginName']"
+                    :query-form-cols-num="2"
+                    :query-form-fields="[
+                      { name: 'loginName', label: $t('loginName'), type: 'w-text' },
+                      { name: 'userName', label: $t('userName'), type: 'w-text' },
+                    ]"
+                    :toolbar-actions="['query', 'separator', 'reset']"
+                    :ticked-record="{
+                      columnName: valueUseColumnName,
+                      data: typeof modelValue === 'string' ? [modelValue] : modelValue,
+                    }"
+                    :columns="[
+                      { name: 'loginName', label: $t('loginName') },
+                      { name: 'userName', label: $t('userName') },
+                      { name: 'description', label: $t('description') },
+                      { name: 'enable', label: $t('status'), format: Formater.enableTag() },
+                    ]"
+                    @row-click="userRowClick"
+                    @update-ticked="updateTicked"
+                    @update-tickeds="updateTickeds"
+                  >
+                  </w-grid>
+                </div>
               </template>
             </q-splitter>
           </q-popup-proxy>
@@ -85,7 +126,7 @@
 
 <script setup lang="ts">
 import { ref, computed, useAttrs, toRaw, watch, onMounted } from 'vue';
-import { Tools, axios, Environment, Formater } from '@/platform';
+import { Tools, axios, Environment, Formater, $t } from '@/platform';
 import { FormFieldProps } from '@/platform/components/form/FormField.ts';
 import { FormFieldMethods } from '../form/FormField';
 
@@ -94,6 +135,7 @@ const attrs = useAttrs();
 const modelValue = defineModel<string | Array<string>>();
 const modelObjectValue = ref(<any>[]); // 模型值包含实际值与显示值的对象集合。
 const orgGridRef = ref();
+const roleGridRef = ref();
 const userGridRef = ref();
 
 const userGridFetchDataUrl = Environment.apiContextPath('/api/system/user');
@@ -255,6 +297,10 @@ const userRowClick = (args) => {
 const orgRowClick = (args) => {
   userGridRef.value.setFetchDataUrl(userGridFetchDataByOrgUrl + '?orgId=' + args.row['id']);
   userGridRef.value.refresh();
+  console.info('orgRowClick======================');
+};
+const orgUpdateTicked = (args) => {
+  console.info('orgUpdateTicked======================');
 };
 
 watch(
diff --git a/io.sc.platform.core.frontend/src/views/likm/Form.vue b/io.sc.platform.core.frontend/src/views/likm/Form.vue
index d3c89f2b..f71a3bdb 100644
--- a/io.sc.platform.core.frontend/src/views/likm/Form.vue
+++ b/io.sc.platform.core.frontend/src/views/likm/Form.vue
@@ -227,6 +227,9 @@
           label: '数字',
           type: 'w-number',
           precision: 2,
+          prefix: '￥',
+          colsFirst: true,
+          colSpan: 'full',
           requiredIf: (args) => {
             return true;
           },
diff --git a/io.sc.platform.core.frontend/src/views/likm/Grid.vue b/io.sc.platform.core.frontend/src/views/likm/Grid.vue
index 9c384f76..fd4d8c5c 100644
--- a/io.sc.platform.core.frontend/src/views/likm/Grid.vue
+++ b/io.sc.platform.core.frontend/src/views/likm/Grid.vue
@@ -1,74 +1,19 @@
 <template>
   <w-grid
-    :title="$t('menu.developer.springboot.bean')"
+    title="用户列表"
     :checkbox-selection="false"
-    :fetch-data-url="Environment.apiContextPath('/api/developer/springboot/beans')"
+    :fetch-data-url="Environment.apiContextPath('/api/system/user')"
     :pageable="false"
-    :toolbar-actions="['refresh', 'separator', 'view', 'separator', 'export']"
-    group-mode="alone"
-    group-by-field="scope"
+    :toolbar-actions="['query', 'reset']"
+    :query-form-fields="[{ name: 'lastModifyDate', label: $t('lastModifyDate'), type: 'w-date-range' }]"
     :columns="[
-      { width: 500, name: 'name', label: $t('name') },
-      { width: 400, name: 'type', label: $t('className'), format: Formater.simpleClassName() },
+      { name: 'loginName', label: $t('loginName') },
+      { name: 'userName', label: $t('userName') },
       {
-        width: 100,
-        name: 'scope',
-        label: $t('scope'),
-        sortable: false,
-        format: (val) => {
-          if (val === 'singleton') {
-            return '测试';
-          } else if (val === 'prototype') {
-            return '测试2';
-          }
-          return val;
-        },
+        name: 'lastModifyDate',
+        label: $t('lastModifyDate'),
       },
     ]"
-    :viewer="{
-      panel: {
-        columnNum: 2,
-        labelWidth: 200,
-        valueWidth: '100%',
-        fields: [
-          { width: 100, name: 'name', label: $t('name') },
-          { width: 100, name: 'context', label: $t('context') },
-          {
-            width: 100,
-            name: 'scope',
-            label: $t('scope'),
-          },
-          { width: 100, name: 'type', label: $t('className'), format: Formater.none() },
-          { width: 100, name: 'resource', label: $t('resource') },
-          {
-            width: 100,
-            name: 'aliases',
-            label: $t('aliases'),
-            format: (aliases) => {
-              aliases = aliases || [];
-              let result = '';
-              for (const aliase of aliases) {
-                result += aliase + '<br/>';
-              }
-              return result;
-            },
-          },
-          {
-            width: 100,
-            name: 'dependencies',
-            label: $t('dependencies'),
-            format: (dependencies) => {
-              dependencies = dependencies || [];
-              let result = '';
-              for (const dependency of dependencies) {
-                result += dependency + '<br/>';
-              }
-              return result;
-            },
-          },
-        ],
-      },
-    }"
   ></w-grid>
 </template>
 <script setup lang="ts">