cnhis-design-vue 2.1.66 → 2.1.69

package/packages/table-filter/src/quick-search/QuickSearch.vue

@@ -9,7 +9,7 @@
         :key="item.sid"
         :class="{
           'quick-block':
-            item.con == 'DATE' || item.con == 'BIRTHDAY' || item.con == 'CONVERT' || item.LABELAttr
+            item.con == 'DATE' || item.con == 'BIRTHDAY' || item.con == 'CONVERT' || item.LABELAttr || item._isBlock
         }"
       >
         <div class="quick-row">
@@ -28,9 +28,11 @@
             </a-tooltip>
           </div>
           <div class="quick-item-col" :class="{ 'quick-item-col-default': source !== 'editTable' }">
+            <!-- 直接渲染组件 -->
+            <RenderWidget v-if="item.isRender" :cfg="item" v-model="item.value" />
             <!-- age -->
             <!-- TODO: 清除，跨表 -->
-            <div v-if="item.AGEAttr" class="age-container">
+            <div v-else-if="item.AGEAttr" class="age-container">
               <range-age
                 :ref="`${item.columnName}_AGEAttr`"
                 :format="item.format"
@@ -162,6 +164,7 @@
                     :min="0"
                     :max="100"
                     allowClear
+                    :placeholder="item.placeholder"
                   />
                 </template>
                 <template v-else>
@@ -174,6 +177,7 @@
                     v-model="item.CL"
                     :class="{ 'psw-icon': item.comAttr == 'PASSWORD' }"
                     allowClear
+                    :placeholder="item.placeholder"
                   >
                     <template slot="suffix" v-if="item.comAttr == 'PASSWORD'">
                       <svg-icon
@@ -195,6 +199,7 @@
                     :min="0"
                     :max="100"
                     allowClear
+                    :placeholder="item.placeholder"
                   />
                 </template>
                 <template v-else>
@@ -206,7 +211,7 @@
                       'font-family': item.PASSWORDTYPE ? 'text-security-disc' : 'inherit'
                     }"
                     v-model="item.EQ"
-                    :placeholder="item.isPreciseSearch || item.fieldType == 'JSONB' ? '' : getI18nText('1.9.6', '区间搜素用~分割')"
+                    :placeholder="item.placeholder || item.isPreciseSearch || item.fieldType == 'JSONB' ? '' : getI18nText('1.9.6', '区间搜素用~分割')"
                     allowClear
                   >
                     <template slot="suffix" v-if="item.comAttr == 'PASSWORD'">
@@ -517,7 +522,7 @@
                         class="EQ-input"
                         :style="`width: ${getEleWidth(item)}`"
                         v-model="item.EQ"
-                        :placeholder="item.isPreciseSearch || item.fieldType == 'JSONB' ? '' : getI18nText('1.9.6', '区间搜素用~分割')"
+                        :placeholder="item.placeholder || item.isPreciseSearch || item.fieldType == 'JSONB' ? '' : getI18nText('1.9.6', '区间搜素用~分割')"
                         allowClear
                       >
                       </a-input>
@@ -728,7 +733,7 @@ import tableSearchCon from "../mixins/tableSearchCon";
 import moment from 'moment';
 import 'moment/locale/zh-cn';
 // antd
-import _ from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
 import { Button, Icon, Dropdown, Select, Upload, DatePicker, Input, Menu, Radio, Checkbox, Row, Tag, InputNumber, Col, Form, Modal, Tooltip } from 'ant-design-vue';
 import rangeAge from '../components/range-age/index';
 import multiSelect from '../components/multi-select/multi-select';
@@ -736,13 +741,17 @@ import resize from 'vue-resize-directive';
 import { durationMixin, $utils, filterApiFn } from '../mixins/mixins';
 import vexutils from '@/utils/vexutils';
 import wordBookutils from '../mixins/wordBookutils';
+import renderWidget from '../mixins/renderWidget';
 import cTreeSelect from '../components/c-tree-select/tree-select';
 import create from '@/core/create';
 import utils from '@/utils/utils-map';
 import {dataOptions} from '../const/dataOptions'
+
+import RenderWidget from '../components/render-widget/index.vue';
+
 export default create({
   name: "quick-search",
-  mixins: [durationMixin, $utils, filterApiFn, tableSearchCon],
+  mixins: [durationMixin, $utils, filterApiFn, tableSearchCon, renderWidget],
   props: {
     visible: Boolean,
     searchFieldList: {
@@ -763,6 +772,7 @@ export default create({
     getFilterData: Function
   },
   components: {
+    RenderWidget,
     rangeAge,
     [Button.name]: Button,
     [Icon.name]: Icon,
@@ -840,16 +850,16 @@ export default create({
         { con: 'YESTERDAY', title: '1.1.4.39', name: '昨天' },
         { con: 'THIS_WEEK', title: '1.1.4.40', name: '本周' },
         { con: 'NEXT_WEEK', title: '1.1.4.41', name: '下周' },
-        { con: 'UP_WEEK', title: '1.1.4.42', name: '上周' },
+        { con: 'LAST_WEEK', title: '1.1.4.42', name: '上周' },
         { con: 'THIS_MONTH', title: '1.1.4.43', name: '本月' },
         { con: 'NEXT_MONTH', title: '1.1.4.44', name: '下月' },
-        { con: 'UP_MONTH', title: '1.1.4.45', name: '上月' },
+        { con: 'LAST_MONTH', title: '1.1.4.45', name: '上月' },
         { con: 'THIS_SEASON', title: '1.1.4.46', name: '本季度' },
         { con: 'NEXT_SEASON', title: '1.1.4.47', name: '下季度' },
-        { con: 'UP_SEASON', title: '1.1.4.48', name: '上季度' },
+        { con: 'LAST_SEASON', title: '1.1.4.48', name: '上季度' },
         { con: 'THIS_YEAR', title: '1.1.4.49', name: '本年' },
         { con: 'NEXT_YEAR', title: '1.1.4.50', name: '下年' },
-        { con: 'UP_YEAR', title: '1.1.4.51', name: '上年' }
+        { con: 'LAST_YEAR', title: '1.1.4.51', name: '上年' }
       ],
       birthdayTeam: [],
       limit_date: "",
@@ -917,7 +927,7 @@ export default create({
       deep: true,
       handler(newVal) {
         if (newVal && this.lastQuickSearchData.length > 0) {
-          this.quickSearch = _.cloneDeep(this.lastQuickSearchData);
+          this.quickSearch = cloneDeep(this.lastQuickSearchData);
         }
       }
     }
@@ -937,12 +947,12 @@ export default create({
       this.quickSearch = [];
       this.relationQuickSearch = [];
       this.birthdayTeam = this.dateTeam.filter(
-        item => item.con != "THIS_YEAR" && item.con != "NEXT_YEAR" && item.con != "UP_YEAR"
+        item => item.con != "THIS_YEAR" && item.con != "NEXT_YEAR" && item.con != "LAST_YEAR"
       );
-      let copyList = _.cloneDeep(this.searchFieldList);
+      let copyList = cloneDeep(this.searchFieldList);
       let mySearchFieldList = copyList.filter(i => i.isShowSearch == 1 && i.filterExplicit != 1) || [];
       // let relationTableList = JSON.parse(JSON.stringify(this.relationTableList));
-      let relationTableList = _.cloneDeep(this.relationTableList);
+      let relationTableList = cloneDeep(this.relationTableList);
 
       // 跨表
       let relationQuickSearch = relationTableList.map(item => {
@@ -989,6 +999,11 @@ export default create({
     setDefaultCon(val) {
       if (!val.length) {
         this.quickSearch.forEach((item, index) => {
+          if (this.isRender(item)) {
+            this.$set(this.quickSearch[index], "value", this.getDefValByRenderWidget(item));
+            return;
+          }
+
           let advanceOptionSetting = item?.advanceOptionSetting;
            //  单选
            let optionSetting0 =String(advanceOptionSetting) == '0';
@@ -1010,6 +1025,11 @@ export default create({
         let optionSetting0 =String(advanceOptionSetting) == '0';
         let find = val.find(valItem => valItem.field_key === item.columnName);
         if (find) {
+          if (this.isRender(item)) {
+            this.$set(this.quickSearch[index], "value", this.getDefValByRenderConObj(find, item));
+            return;
+          }
+
           let value = find?.value
           let isTrance = item.CONVERT && Array.isArray(item.CONVERT) || item.comType == "SelectMui" && item.con == "CONVERT"
           // wordbook多选
@@ -1036,6 +1056,9 @@ export default create({
     handlerInitSearchItem(arr) {
       if (!Array.isArray(arr)) return;
       arr.forEach(el => {
+        // 直接渲染相应组件，不经过下面的字段判断
+        if (this.initRenderWidgetCfg(el)) return;
+
         const isPreciseSearch = el?.settingObj?.isPreciseSearch || "";
 
         if (el.setting) {
@@ -1359,6 +1382,13 @@ export default create({
       let conObj = [];
       for (let i = 0; i < arr.length; i++) {
         let item = arr[i];
+
+        const renderConObj = this.getRenderSearchConObj(item);
+        if (renderConObj) {
+          conObj.push(renderConObj);
+          continue;
+        }
+
         let value = "";
         let limit_date = "";
         let advanceOptionSetting = item?.advanceOptionSetting;
@@ -1656,6 +1686,8 @@ export default create({
         return;
       }
       arr.forEach(item => {
+        if (this.resetRenderWidgetValue(item)) return;
+
         let advanceOptionSetting = item?.advanceOptionSetting;
           //  单选
         let optionSetting0  =String(advanceOptionSetting) === '0';