Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

zs

2025-06-04 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Templete/Web/Controllers/EntityModeQueryDrawerÄ£°å.txt

@@ -20,6 +20,8 @@
  FILTER_MODE_OPTIONS_NUM,
  FILTER_MODE_OPTIONS_BOOL
} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions';
// å¼•å…¥å…¬å…±è¡¨å•å·¥å…·æ–‡ä»¶ 
import { collectFormDataForHighQuery,onResetForHighSelect,onResetForHighQuery } from '@/utils/myformUtils';
import { 
  BOOLEAN_OPTIONS
} from '@/utils/commonOptionConstants';
@@ -99,16 +101,11 @@
    const check = isEqual(initiateData.value, data)
    return check
  }
  const commonGetFormData=()=>{
    const data = {
      $Save_PageAddFormAttributes_Query$
    }
    return data;
  }

  const onClose = (done: () => void) => {
    if (visible.value) {
      visible.value = false
      const data =commonGetFormData();
      const data =collectFormDataForHighQuery(formItems,formData); 
      ctx.emit('close', data)
    }
  }
@@ -116,25 +113,22 @@
   * ç¡®è®¤æŸ¥è¯¢
   */
  const onConfirmQuery = async () => {
    const data =commonGetFormData();
    const data =collectFormDataForHighQuery(formItems,formData); 
    ctx.emit('confirmQuery', data)
  }
  /** 
   * é‡ç½®å…¬å…±select查询 
   */ 
  const onResetForHighSelect = async () => { 
    $Save_PageAddFormAttributes_Query_Clear_HighSelect$
  } 
  /**
   * é‡ç½®æŸ¥è¯¢
   */
  const onReset = async () => {
    formData.value = {}
    onResetForHighSelect();//重置公共select查询 
    $Save_PageAddFormAttributes_Query_Clear$
    //向父组件发送自定义事件
    ctx.emit('restQuery');
  }
    /**
    * é‡ç½®æŸ¥è¯¢ - ä¼˜åŒ–版
    */
    const onReset = async () => {
        // 1. æ¸…空所有基础字段（不包含过滤模式字段）,应用基础字段初始值  
        onResetForHighQuery(formItems,formData);
  
        // 2. ä½¿ç”¨åŽŸæœ‰æ–¹æ³•é‡ç½®è¿‡æ»¤æ¨¡å¼å­—段
        onResetForHighSelect(formItems,formData);
  
        // 3. å‘父组件发送自定义事件
        ctx.emit('restQuery');
    }

  const updateCheckData = () => {
    initiateData.value = {
@@ -159,7 +153,7 @@
    $CommonQueryEnumForFrom$
  }
  commonQueryEnumForFrom()
  onResetForHighSelect();//重置公共select查询 
  onResetForHighSelect(formItems,formData);//重置公共select查询  
  /**
   * å¼¹çª—打开获取详情
   */