From 0306b8669ee170ceca64b94efcc929c6bca34cea Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Wed, 5 Apr 2023 11:51:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E7=B3=BB=E5=88=97bu?=
 =?UTF-8?q?g=20[issue/289]=E6=96=B0=E5=A2=9E=E9=80=9A=E7=9F=A5=E5=85=AC?=
 =?UTF-8?q?=E5=91=8A=E6=8F=90=E4=BA=A4=E6=8C=87=E5=AE=9A=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=9C=89undefined=20[issue/382]=E7=9C=81?=
 =?UTF-8?q?=E5=B8=82=E5=8C=BA=E7=BB=84=E4=BB=B6JAreaLinkage=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E5=9B=9E=E6=98=BE=20[issue/397]=E5=9C=A8?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=B8=AD=E4=BD=BF=E7=94=A8v-model:value?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9AJSelectDept=E7=BB=84=E4=BB=B6=E6=97=B6?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=B8=85=E9=99=A4=E5=B7=B2=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=20[issue/286]=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86=E9=97=AE=E9=A2=98=20[issue/426]?=
 =?UTF-8?q?=E5=BC=95=E5=85=A5=E7=9A=84=E5=9B=9E=E5=BD=92=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=20JPopupOnlReportModal.vue=20=E4=B8=AD=E6=9C=AA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20[issue/429]=E6=A0=91=E6=90=9C=E7=B4=A2=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E4=BA=8B=E4=BB=B6=E5=A4=B1=E6=95=88=20=E3=80=90issues?=
 =?UTF-8?q?/394=E3=80=91=E6=89=80=E5=B1=9E=E9=83=A8=E9=97=A8=E6=A0=91?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=85=A8=E9=83=A8=E5=8B=BE=E9=80=89=E4=B8=8D?=
 =?UTF-8?q?=E7=94=9F=E6=95=88/=E3=80=90issues/4646=E3=80=91=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E5=85=A8=E9=83=A8=E5=8B=BE=E9=80=89=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=A1=AE=E8=AE=A4=E6=8C=89=E9=92=AE=EF=BC=8C?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BF=A1=E6=81=AF=E4=B8=A2=E5=A4=B1=20?=
 =?UTF-8?q?=E3=80=90issues/424=E3=80=91=E5=BC=80=E5=90=AF=E5=8F=B3?=
 =?UTF-8?q?=E4=BE=A7=E5=88=97=E8=A1=A8=E5=90=8E=EF=BC=8C=E5=9C=A8=E5=8F=B3?=
 =?UTF-8?q?=E4=BE=A7=E5=88=97=E8=A1=A8=E4=B8=AD=E5=88=A0=E9=99=A4=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=97=B6=EF=BC=8C=E9=80=BB=E8=BE=91=E6=9C=89=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20=E3=80=90issues/4507=E3=80=91JDictSelectTag?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BD=BF=E7=94=A8=E6=97=B6=EF=BC=8C=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E5=99=A8=E7=BB=99=E5=87=BA=E8=AD=A6=E5=91=8A=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=9AExpected=20Function,=20got=20Array?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/jeecg/components/JDictSelectTag.vue   |  6 ++++-
 .../src/jeecg/components/JSearchSelect.vue    |  5 ++++
 .../components/modal/JPopupOnlReportModal.vue |  2 +-
 .../Form/src/jeecg/hooks/useSelectBiz.ts      |  6 +++--
 .../Form/src/jeecg/hooks/useTreeBiz.ts        | 25 ++++++++++++++++++-
 src/components/Form/src/utils/Area.ts         | 12 ++++++---
 src/components/Tree/src/BasicTree.vue         |  8 +++---
 .../jeecg/OnLine/hooks/usePopBiz.ts           | 23 +++++++++++++++--
 src/views/system/notice/NoticeModal.vue       |  8 +++++-
 9 files changed, 80 insertions(+), 15 deletions(-)

diff --git a/src/components/Form/src/jeecg/components/JDictSelectTag.vue b/src/components/Form/src/jeecg/components/JDictSelectTag.vue
index a833c26..5feddd0 100644
--- a/src/components/Form/src/jeecg/components/JDictSelectTag.vue
+++ b/src/components/Form/src/jeecg/components/JDictSelectTag.vue
@@ -81,7 +81,7 @@
         required: false,
       },
     },
-    emits: ['options-change', 'change'],
+    emits: ['options-change', 'change','update:value'],
     setup(props, { emit, refs }) {
       const dictOptions = ref<any[]>([]);
       const attrs = useAttrs();
@@ -164,6 +164,10 @@
           changeValue = e?.target?.value ?? e;
         }
         state.value = changeValue;
+
+        //update-begin---author:wangshuai ---date:20230403  for：【issues/4507】JDictSelectTag组件使用时，浏览器给出警告提示：Expected Function, got Array------------
+        emit('update:value',changeValue)
+        //update-end---author:wangshuai ---date:20230403  for：【issues/4507】JDictSelectTag组件使用时，浏览器给出警告提示：Expected Function, got Array述------------
         //update-end---author:wangshuai ---date:20230216  for：[QQYUN-4290]公文发文：选择机关代字报错,是因为值改变触发了change事件三次，导致数据发生改变------------
         
         // nextTick(() => formItemContext.onFieldChange());
diff --git a/src/components/Form/src/jeecg/components/JSearchSelect.vue b/src/components/Form/src/jeecg/components/JSearchSelect.vue
index 8a46827..6cdb2f4 100644
--- a/src/components/Form/src/jeecg/components/JSearchSelect.vue
+++ b/src/components/Form/src/jeecg/components/JSearchSelect.vue
@@ -29,6 +29,7 @@
     :placeholder="placeholder"
     :filterOption="filterOption"
     :notFoundContent="loading ? undefined : null"
+    :dropdownAlign="{overflow: {adjustY: adjustY }}"
     @change="handleChange"
   >
     <template #notFoundContent>
@@ -64,6 +65,10 @@
         type: Function,
         default: (node) => node.parentNode,
       },
+      //默认开启Y轴溢出位置调整，因此在可视空间不足时下拉框位置会自动上移，导致Select的输入框被遮挡。需要注意的是，默认情况是是可视空间，而不是所拥有的空间
+      //update-begin-author:liusq date:2023-04-04 for:[issue/286]下拉搜索框遮挡问题
+      adjustY:propTypes.bool.def(true),
+      //update-end-author:liusq date:2023-04-04 for:[issue/286]下拉搜索框遮挡问题
       //是否在有值后立即触发change
       immediateChange: propTypes.bool.def(false),
       //update-begin-author:taoyan date:2022-8-15 for: VUEN-1971 【online 专项测试】关联记录和他表字段 1
diff --git a/src/components/Form/src/jeecg/components/modal/JPopupOnlReportModal.vue b/src/components/Form/src/jeecg/components/modal/JPopupOnlReportModal.vue
index 2ddcc9d..645ad95 100644
--- a/src/components/Form/src/jeecg/components/modal/JPopupOnlReportModal.vue
+++ b/src/components/Form/src/jeecg/components/modal/JPopupOnlReportModal.vue
@@ -129,7 +129,7 @@
           queryParam,
           dictOptions,
         },
-      ] = usePopBiz(getBindValue);
+      ] = usePopBiz(getBindValue,tableRef);
 
       const showSearchFlag = computed(() => unref(queryInfo) && unref(queryInfo).length > 0);
       /**
diff --git a/src/components/Form/src/jeecg/hooks/useSelectBiz.ts b/src/components/Form/src/jeecg/hooks/useSelectBiz.ts
index 5d36216..2509423 100644
--- a/src/components/Form/src/jeecg/hooks/useSelectBiz.ts
+++ b/src/components/Form/src/jeecg/hooks/useSelectBiz.ts
@@ -138,8 +138,10 @@ export function useSelectBiz(getList, props) {
   }
   //删除已选择的信息
   function handleDeleteSelected(record) {
-    checkedKeys.value = checkedKeys.value.splice(checkedKeys.value.indexOf(record['id']), 1);
-    selectRows.value = selectRows.value.filter((item) => item['id'] !== record['id']);
+    //update-begin---author:wangshuai ---date:20230404  for：【issues/424】开启右侧列表后，在右侧列表中删除用户时，逻辑有问题------------
+    checkedKeys.value = checkedKeys.value.filter((item) => item != record[props.rowKey]);
+    selectRows.value = selectRows.value.filter((item) => item[props.rowKey] !== record[props.rowKey]);
+    //update-end---author:wangshuai ---date:20230404  for：【issues/424】开启右侧列表后，在右侧列表中删除用户时，逻辑有问题------------
   }
   //清空选择项
   function reset() {
diff --git a/src/components/Form/src/jeecg/hooks/useTreeBiz.ts b/src/components/Form/src/jeecg/hooks/useTreeBiz.ts
index 5ac2029..11eb301 100644
--- a/src/components/Form/src/jeecg/hooks/useTreeBiz.ts
+++ b/src/components/Form/src/jeecg/hooks/useTreeBiz.ts
@@ -115,8 +115,31 @@ export function useTreeBiz(treeRef, getList, props) {
   /**
    * 勾选全部
    */
-  function checkALL(checkAll) {
+  async function checkALL(checkAll) {
     getTree().checkAll(checkAll);
+    //update-begin---author:wangshuai ---date:20230403  for：【issues/394】所属部门树操作全部勾选不生效/【issues/4646】部门全部勾选后，点击确认按钮，部门信息丢失------------
+    await nextTick();
+    checkedKeys.value = getTree().getCheckedKeys();
+    if(checkAll){
+      getTreeRow();
+    }else{
+      selectRows.value = [];
+    }
+    //update-end---author:wangshuai ---date:20230403  for：【issues/394】所属部门树操作全部勾选不生效/【issues/4646】部门全部勾选后，点击确认按钮，部门信息丢失------------
+  }
+
+  /**
+   * 获取数列表
+   * @param res
+   */
+  function getTreeRow() {
+    let ids = "";
+    if(unref(checkedKeys).length>0){
+      ids = checkedKeys.value.join(",");
+    }
+    getList({ids:ids}).then((res) =>{
+      selectRows.value = res;
+    })
   }
 
   /**
diff --git a/src/components/Form/src/utils/Area.ts b/src/components/Form/src/utils/Area.ts
index c410ec5..5b96051 100644
--- a/src/components/Form/src/utils/Area.ts
+++ b/src/components/Form/src/utils/Area.ts
@@ -56,15 +56,17 @@ class Area {
       }
     }
   }
-
-  getText(code) {
+  
+//update-begin-author:liusq---date:20230404--for: [issue/382]省市区组件JAreaLinkage数据不回显---
+  getText(code,index=3) {
     if (!code || code.length == 0) {
       return '';
     }
     let arr = [];
-    this.getAreaBycode(code, arr, 3);
+    this.getAreaBycode(code, arr, index);
     return arr.join('/');
   }
+//update-end-author:liusq---date:20230404--for: [issue/382]省市区组件JAreaLinkage数据不回显---
 
   getRealCode(code) {
     let arr = [];
@@ -98,12 +100,14 @@ const jeecgAreaData = new Area();
 
 // 根据code找文本
 const getAreaTextByCode = function (code) {
+  let index = 3;
   //update-begin-author:liusq---date:20220531--for: 判断code是否是多code逗号分割的字符串，是的话，获取最后一位的code ---
   if (code && code.includes(',')) {
+    index = code.split(",").length;
     code = code.substr(code.lastIndexOf(',') + 1);
   }
   //update-end-author:liusq---date:20220531--for: 判断code是否是多code逗号分割的字符串，是的话，获取最后一位的code ---
-  return jeecgAreaData.getText(code);
+  return jeecgAreaData.getText(code,index);
 };
 
 export { getAreaTextByCode };
diff --git a/src/components/Tree/src/BasicTree.vue b/src/components/Tree/src/BasicTree.vue
index c1d52f5..a18bde8 100644
--- a/src/components/Tree/src/BasicTree.vue
+++ b/src/components/Tree/src/BasicTree.vue
@@ -90,11 +90,13 @@
           onCheck: (v: CheckKeys, e) => {
             let currentValue = toRaw(state.checkedKeys) as KeyType[];
             if (isArray(currentValue) && searchState.startSearch) {
-              const { key } = unref(getFieldNames);
-              currentValue = difference(currentValue, getChildrenKeys(e.node.$attrs.node[key]));
+             //update-begin-author:liusq---date:20230404--for: [issue/429]树搜索点击事件失效--- 
+              const value = e.node.eventKey;
+              currentValue = difference(currentValue, getChildrenKeys(value));
               if (e.checked) {
-                currentValue.push(e.node.$attrs.node[key]);
+                  currentValue.push(value);
               }
+             //update-begin-author:liusq---date:20230404--for: [issue/429]树搜索点击事件失效---
               state.checkedKeys = currentValue;
             } else {
               state.checkedKeys = v;
diff --git a/src/components/jeecg/OnLine/hooks/usePopBiz.ts b/src/components/jeecg/OnLine/hooks/usePopBiz.ts
index e5fda66..c25c085 100644
--- a/src/components/jeecg/OnLine/hooks/usePopBiz.ts
+++ b/src/components/jeecg/OnLine/hooks/usePopBiz.ts
@@ -5,7 +5,7 @@ import { filterMultiDictText } from '/@/utils/dict/JDictSelectUtil.js';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { OnlineColumn } from '/@/components/jeecg/OnLine/types/onlineConfig';
 import { h } from 'vue';
-import { useRouter } from 'vue-router';
+import { useRouter, useRoute } from 'vue-router';
 import { useMethods } from '/@/hooks/system/useMethods';
 import { importViewsFile } from '/@/utils';
 
@@ -33,6 +33,8 @@ export function usePopBiz(props, tableRef?) {
   const dataSource = ref<Array<object>>([]);
   //定义表格信息
   const columns = ref<Array<object>>([]);
+  // 当前路由
+  const route = useRoute();
   //定义请求url信息
   const configUrl = reactive({
     //列表页加载column和data
@@ -533,6 +535,7 @@ export function usePopBiz(props, tableRef?) {
       pagination.current = 1;
     }
     let params = getQueryParams(); //查询条件
+    params['onlRepUrlParamStr'] = getUrlParamString();
     console.log('params', params);
     loading.value = true;
     let url = `${configUrl.getData}${unref(cgRpConfigId)}`;
@@ -546,6 +549,20 @@ export function usePopBiz(props, tableRef?) {
     });
   }
 
+  /**
+   * 获取地址栏的参数
+   */
+  function getUrlParamString() {
+   let query = route.query;
+   let arr:any[] = []
+   if(query && Object.keys(query).length>0){
+     Object.keys(query).map(k=>{
+       arr.push(`${k}=${query[k]}`)
+     })
+   }
+   return arr.join('&')
+  }
+
   /**
    * 设置dataSource
    */
@@ -560,9 +577,11 @@ export function usePopBiz(props, tableRef?) {
       }
       dataSource.value = data.records;
       //update-begin-author:taoyan date:2023-2-11 for:issues/356 在线报表分页有问题
-      tableRef.value && tableRef.value.setPagination({
+      //update-begin-author:liusq date:2023-4-04 for:issues/426 修复356时候引入的回归错误 JPopupOnlReportModal.vue 中未修改
+      tableRef?.value && tableRef?.value?.setPagination({
         total: Number(data.total)
       })
+      //update-end-author:liusq date:2023-4-04  for:issues/426 修复356时候引入的回归错误 JPopupOnlReportModal.vue 中未修改
       //update-end-author:taoyan date:2023-2-11 for:issues/356 在线报表分页有问题
     } else {
       pagination.total = 0;
diff --git a/src/views/system/notice/NoticeModal.vue b/src/views/system/notice/NoticeModal.vue
index 84bc9e3..fc114f3 100644
--- a/src/views/system/notice/NoticeModal.vue
+++ b/src/views/system/notice/NoticeModal.vue
@@ -41,7 +41,13 @@
       let values = await validate();
       setModalProps({ confirmLoading: true });
       //提交表单
-      values.userIds += ',';
+      //update-begin-author:liusq---date:20230404--for: [issue#429]新增通知公告提交指定用户参数有undefined --- 
+      if(values.msgType==='ALL'){
+        values.userIds = '';
+      }else{
+        values.userIds += ',';
+      }
+      //update-end-author:liusq---date:20230404--for: [issue#429]新增通知公告提交指定用户参数有undefined --- 
       await saveOrUpdate(values, isUpdate.value);
       //关闭弹窗
       closeModal();