cnhis-design-vue 3.1.43-beta.3 → 3.1.43-beta.6

package/es/components/table-filter/src/hooks/useAdvanced.d.ts

@@ -7,15 +7,19 @@ export default function useAdvanced(): {
         setting: string;
         widgetCfg: {
             isRender: boolean;
+            isInit: boolean;
             widgetType: string | null;
             valueList: {
                 value: any;
-                label: string;
+                label: any;
             }[] | undefined;
             defaultValue: any;
             defValueUnit: any;
             multiple: boolean;
+            manualMapping: boolean | null | undefined;
+            dynamicOptionInfo: import("../../../../../es/components/table-filter/src/types").dynamicOptionInfoType | {} | undefined;
         };
+        rangeFilter: boolean | undefined;
         title: string;
         alias: string | undefined;
         isShowSearch: number;
@@ -23,7 +27,7 @@ export default function useAdvanced(): {
         explicitRequired: number;
         advanceOptionSetting: string;
         placeholder: string | undefined;
-        advanceColWidth: string;
+        advanceColWidth: number | null | undefined;
     }[];
     getCacheDef: (item: ISearchType, cacheList: string[]) => string | string[];
     transformClassifyChild: (conObjList: any) => {};

package/es/components/table-filter/src/hooks/useAdvanced.js

@@ -1 +1 @@
-import{WidgetOptionEnums as e,WidgetTypeEnums as t}from"../types/enums.js";import{presetValToTimestamp as i}from"../components/render-widget/helpers/presetValToTimestamp.js";import{DatePresetValEnums as l}from"../components/render-widget/enums.js";const n={[e.RADIO]:"0",[e.MULTIPLE]:"1",[e.ALL]:"0",[e.SELECT_TIME]:"1",[e.PAST_TIME]:"2",[e.FUTURE_TIME]:"3"};function o(){return{transformData:function(i){return i.map((i=>{var l,o;const{optionInfo:a={list:[]},type:r,defaultValue:u,optionType:s,filterExplicit:d}=i,p={},c={title:(f=i).title,alias:f.customTitle,isShowSearch:f.isShowSearch?1:0,filterExplicit:f.filterExplicit?1:0,explicitRequired:f.explicitRequired?1:0,advanceOptionSetting:f.optionType?n[f.optionType]:"",placeholder:f.remark,advanceColWidth:String(f.width)};var f;let m,v,T=r;d?(m=r===t.SELECT&&s===e.MULTIPLE?null==u?void 0:u.valueList:null==(l=null==u?void 0:u.valueList)?void 0:l[0],v=null==u?void 0:u.unit):r===t.SELECT&&(null==a?void 0:a.list)&&(null==a?void 0:a.list.length)<10&&(T="CHECKBOX_GROUP");const g={isRender:!0,widgetType:T,valueList:null==(o=null==a?void 0:a.list)?void 0:o.map((({name:e,value:t})=>({value:t,label:e}))),defaultValue:m,defValueUnit:v,multiple:s===e.MULTIPLE};return{...c,fieldType:i.dataType,columnName:i.name,settingObj:p,setting:JSON.stringify(p),widgetCfg:g}}))},getCacheDef:function(e,i){const{widgetType:l,widgetCfg:n}=e;return l===t.SELECT&&n.multiple?i:i[0]},transformClassifyChild:function(e){const t={};return e&&e.length>0&&e.forEach((e=>{const n=e.field_key,o=e.value&&e.value.length>1?e.value:e.value.toString();if(t[n]=o,e.unit&&e.unit!==l.CUSTOM){const l=i(e.unit,"YYYY-MM-DD HH:mm:ss");t[n]=l}})),t},transformParams:function(e){const t={};return e&&e.length>0&&e.forEach((e=>{const i=e.field_key,l=e.value&&e.value.length>1?e.value:e.value.toString();t[i]=l})),t}}}export{o as default};
+import{WidgetOptionEnums as e,WidgetTypeEnums as t}from"../types/enums.js";import{presetValToTimestamp as i}from"../components/render-widget/helpers/presetValToTimestamp.js";import{DatePresetValEnums as n}from"../components/render-widget/enums.js";const l={[e.RADIO]:"0",[e.MULTIPLE]:"1",[e.ALL]:"0",[e.SELECT_TIME]:"1",[e.PAST_TIME]:"2",[e.FUTURE_TIME]:"3"};function a(){return{transformData:function(i){return i.map((i=>{var n,a;const{optionInfo:o={list:[],manualMapping:!0,dynamicOptionInfo:{}},type:u,defaultValue:r,optionType:s,filterExplicit:p,rangeFilter:d}=i,c={},m={title:(f=i).title,alias:f.customTitle,isShowSearch:f.isShowSearch?1:0,filterExplicit:f.filterExplicit?1:0,explicitRequired:f.explicitRequired?1:0,advanceOptionSetting:f.optionType?l[f.optionType]:"",placeholder:f.remark,advanceColWidth:f.width};var f;let v,g,T=u;p?(v=u===t.SELECT&&s===e.MULTIPLE?null==r?void 0:r.valueList:null==(n=null==r?void 0:r.valueList)?void 0:n[0],g=null==r?void 0:r.unit):u===t.SELECT&&(null==o?void 0:o.list)&&(null==o?void 0:o.list.length)<10&&(T="CHECKBOX_GROUP"),u===t.INPUT_NUMBER&&d&&(T="INPUTNUMBER_GROUP");const E={isRender:!0,isInit:!1,widgetType:T,valueList:null==(a=null==o?void 0:o.list)?void 0:a.map((({name:e,value:t})=>({value:t,label:e}))),defaultValue:v,defValueUnit:g,multiple:s===e.MULTIPLE,manualMapping:null==o?void 0:o.manualMapping,dynamicOptionInfo:null==o?void 0:o.dynamicOptionInfo};return{...m,fieldType:i.dataType,columnName:i.name,settingObj:c,setting:JSON.stringify(c),widgetCfg:E,rangeFilter:d}}))},getCacheDef:function(e,i){const{widgetType:n,widgetCfg:l}=e;return n===t.SELECT&&l.multiple?i:i[0]},transformClassifyChild:function(e){const t={};return e&&e.length>0&&e.forEach((e=>{const l=e.field_key,a=e.value&&e.value.length>1?e.value:e.value.toString();if(t[l]=a,e.unit&&e.unit!==n.CUSTOM){const n=i(e.unit,"YYYY-MM-DD HH:mm:ss");t[l]=n}})),t},transformParams:function(e){const t={};return e&&e.length>0&&e.forEach((e=>{const i=e.field_key,n=e.value&&e.value.length>1?e.value:e.value.toString();t[i]=n})),t}}}export{a as default};

package/es/components/table-filter/src/hooks/useRenderWidget.js

@@ -1 +1 @@
-import{WidgetCfgMaps as e}from"../components/render-widget/widgetCfgMaps.js";import{DatePresetValEnums as n}from"../components/render-widget/enums.js";import{WidgetTypeEnums as t}from"../types/enums.js";const r=[t.CHECKBOX_GROUP];function i(){function i(e){var n;return null==(n=e.widgetCfg)?void 0:n.isRender}function u(n){const{widgetType:t,defaultValue:r,defValueUnit:i}=n.widgetCfg||{},u=e.get(t);let l;if(u){const{setDefaultValue:e}=u;e&&(l=e(r,i))}return l}return{isRender:i,getDefValByRenderWidget:u,initRenderWidgetCfg:function(e){const n=i(e);if(!n)return n;const{widgetType:t}=e.widgetCfg||{};return e._frontId="xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,(e=>{const n=16*Math.random()|0;return("x"===e?n:3&n|8).toString(16)})),e.isRender=n,e.widgetType=t,e.con="EQ",r.includes(t)&&(e._isBlock=!0),e.value=u(e),n},getRenderSearchConObj:function(e){if(!i(e))return null;const{columnName:r,con:u,value:l,widgetType:o}=e;let d=null;[t.DATE,t.DATE_TIME].includes(o)&&(d=n.CUSTOM);const s=Array.isArray(l)?l:l?[l]:[];return{field_key:r,con:u,value:s.length>0?s:null,unit:d}},getDefValByRenderConObj:function(e,n){if(!i(n))return null;const{widgetType:r,multiple:u}=n.widgetCfg||{},{value:l}=e;return r!==t.SELECT&&r!==t.CHECKBOX_GROUP||!u?Array.isArray(l)?l[0]:l:Array.isArray(l)?l:l?[l]:[]},isExistDefValByRenderWidget:function(e){const{defaultValue:n,defValueUnit:t}=e.widgetCfg||{};return!(!n&&!t)},resetRenderWidgetValue:function(e){const n=i(e);return n?(e.value=null,n):n}}}export{i as default};
+import{WidgetCfgMaps as e}from"../components/render-widget/widgetCfgMaps.js";import{DatePresetValEnums as n}from"../components/render-widget/enums.js";import{WidgetTypeEnums as t}from"../types/enums.js";const r=[t.CHECKBOX_GROUP];function i(){function i(e){var n;return null==(n=e.widgetCfg)?void 0:n.isRender}function u(n){const{rangeFilter:t}=n,{widgetType:r,defaultValue:i,defValueUnit:u}=n.widgetCfg||{},l=e.get(r);let o;if(l){const{setDefaultValue:e}=l;e&&!t&&(o=e(i,u))}return o}return{isRender:i,getDefValByRenderWidget:u,initRenderWidgetCfg:function(e){const n=i(e);if(!n)return n;const{widgetType:t}=e.widgetCfg||{};return e._frontId="xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,(e=>{const n=16*Math.random()|0;return("x"===e?n:3&n|8).toString(16)})),e.isRender=n,e.widgetType=t,e.con="EQ",(r.includes(t)||e.rangeFilter)&&(e._isBlock=!0),e.value=u(e),n},getRenderSearchConObj:function(e){if(!i(e))return null;const{columnName:r,con:u,value:l,widgetType:o}=e;let d=null;[t.DATE,t.DATE_TIME].includes(o)&&(d=n.CUSTOM);const a=Array.isArray(l)?l:l?[l]:[];return{field_key:r,con:u,value:a.length>0?a:null,unit:d}},getDefValByRenderConObj:function(e,n){if(!i(n))return null;const{widgetType:r,multiple:u}=n.widgetCfg||{},{value:l}=e;return r!==t.SELECT&&r!==t.CHECKBOX_GROUP||!u?Array.isArray(l)?l[0]:l:Array.isArray(l)?l:l?[l]:[]},isExistDefValByRenderWidget:function(e){const{defaultValue:n,defValueUnit:t}=e.widgetCfg||{};return!(!n&&!t)},resetRenderWidgetValue:function(e){const n=i(e);return n?(e.value=null,n):n}}}export{i as default};

package/es/components/table-filter/src/types/enums.d.ts

@@ -21,6 +21,7 @@ export declare const WidgetTypeEnums: {
     DATE: string;
     DATE_TIME: string;
     CHECKBOX_GROUP: string;
+    INPUTNUMBER_GROUP: string;
 };
 export declare const WidgetOptionEnums: {
     RADIO: string;

package/es/components/table-filter/src/types/enums.js

@@ -1 +1 @@
-const T={TEXT:"TEXT",NUMBER:"NUMBER",DATE:"DATE",DATE_TIME:"DATETIME",TIME:"TIME",BOOLEAN:"BOOLEAN"},E={SQL:"SQL",API:"API"},A={MANUAL:"manual",DICT:"dict"},_={INPUT_NUMBER:"NUMBER",INPUT:"TEXT",SELECT:"SELECT",DATE:"DATE",DATE_TIME:"DATETIME",CHECKBOX_GROUP:"CHECKBOX_GROUP"},R={RADIO:"SELECT_SINGLE",MULTIPLE:"SELECT_MULTIPLE",ALL:"DATETIME_WHOLE",SELECT_TIME:"DATETIME_SELECT",PAST_TIME:"DATETIME_PAST",FUTURE_TIME:"DATETIME_FUTURE"},S={CUSTOM:"CUSTOM",FIRST_VAL:"FIRST",NOW:"NOW",TODAY:"TODAY",TODAY_START:"TODAY_START",TODAY_END:"TODAY_END",TOMORROW:"TOMORROW",TOMORROW_START:"TOMORROW_START",TOMORROW_END:"TOMORROW_END",YESTERDAY:"YESTERDAY",YESTERDAY_START:"YESTERDAY_START",YESTERDAY_END:"YESTERDAY_END",THIS_WEEK:"THIS_WEEK",WEEK_START:"THIS_WEEK_START",WEEK_END:"THIS_WEEK_END",NEXT_WEEK:"NEXT_WEEK",LAST_WEEK:"LAST_WEEK",THIS_MONTH:"THIS_MONTH",MONTH_START:"THIS_MONTH_START",MONTH_END:"THIS_MONTH_END",NEXT_MONTH:"NEXT_MONTH",LAST_MONTH:"LAST_MONTH",THIS_QUARTER:"THIS_QUARTER",NEXT_QUARTER:"NEXT_QUARTER",LAST_QUARTER:"LAST_QUARTER",THIS_YEAR:"THIS_YEAR",NEXT_YEAR:"NEXT_YEAR",LAST_YEAR:"LAST_YEAR"},O={NULL:"NULL",EQUAL:"EQ"};export{O as ConditionEnums,E as DataTypeEnums,T as FieldTypeEnums,A as MappingMethodEnums,R as WidgetOptionEnums,_ as WidgetTypeEnums,S as WidgetValEnums};
+const T={TEXT:"TEXT",NUMBER:"NUMBER",DATE:"DATE",DATE_TIME:"DATETIME",TIME:"TIME",BOOLEAN:"BOOLEAN"},E={SQL:"SQL",API:"API"},A={MANUAL:"manual",DICT:"dict"},_={INPUT_NUMBER:"NUMBER",INPUT:"TEXT",SELECT:"SELECT",DATE:"DATE",DATE_TIME:"DATETIME",CHECKBOX_GROUP:"CHECKBOX_GROUP",INPUTNUMBER_GROUP:"INPUTNUMBER_GROUP"},R={RADIO:"SELECT_SINGLE",MULTIPLE:"SELECT_MULTIPLE",ALL:"DATETIME_WHOLE",SELECT_TIME:"DATETIME_SELECT",PAST_TIME:"DATETIME_PAST",FUTURE_TIME:"DATETIME_FUTURE"},S={CUSTOM:"CUSTOM",FIRST_VAL:"FIRST",NOW:"NOW",TODAY:"TODAY",TODAY_START:"TODAY_START",TODAY_END:"TODAY_END",TOMORROW:"TOMORROW",TOMORROW_START:"TOMORROW_START",TOMORROW_END:"TOMORROW_END",YESTERDAY:"YESTERDAY",YESTERDAY_START:"YESTERDAY_START",YESTERDAY_END:"YESTERDAY_END",THIS_WEEK:"THIS_WEEK",WEEK_START:"THIS_WEEK_START",WEEK_END:"THIS_WEEK_END",NEXT_WEEK:"NEXT_WEEK",LAST_WEEK:"LAST_WEEK",THIS_MONTH:"THIS_MONTH",MONTH_START:"THIS_MONTH_START",MONTH_END:"THIS_MONTH_END",NEXT_MONTH:"NEXT_MONTH",LAST_MONTH:"LAST_MONTH",THIS_QUARTER:"THIS_QUARTER",NEXT_QUARTER:"NEXT_QUARTER",LAST_QUARTER:"LAST_QUARTER",THIS_YEAR:"THIS_YEAR",NEXT_YEAR:"NEXT_YEAR",LAST_YEAR:"LAST_YEAR"},O={NULL:"NULL",EQUAL:"EQ"};export{O as ConditionEnums,E as DataTypeEnums,T as FieldTypeEnums,A as MappingMethodEnums,R as WidgetOptionEnums,_ as WidgetTypeEnums,S as WidgetValEnums};

package/es/components/table-filter/src/types/index.d.ts

@@ -1,98 +1,27 @@
 export declare type funcVoid = () => void;
 export declare type ISearchType = {
+    isShowSearch?: number;
+    filterExplicit?: number;
+    explicitRequired?: number;
+    advanceOptionSetting?: string;
+    explicitDefaultVal?: string;
+    advanceColWidth?: string;
+    fieldType?: string;
     columnName: string;
     title: string;
-    fieldType?: string;
-    filterExplicit?: number;
-    isShowSearch?: number;
-    setting?: any;
-    settingObj?: any;
     placeholder?: string;
-    AGEAttr?: boolean;
-    CL?: string;
-    CONVERT?: any;
-    EVALUATEAttr?: boolean;
-    EQ?: string;
-    LABELAttr?: boolean;
-    _isBlock?: boolean;
+    settingObj?: any;
+    setting?: any;
+    widgetCfg?: any;
+    rangeFilter?: boolean;
     _frontId?: any;
-    NUMBERFiled?: boolean;
-    PASSWORDTYPE?: boolean;
-    advanceColWidth?: string;
-    advanceOptionSetting?: string;
-    alias?: string;
-    ageObj?: any;
-    attr?: string;
-    bigValue?: string | number;
-    classify?: string;
-    colWidth?: number;
-    columnFullName?: string;
-    com?: string;
-    comType?: string;
-    comAttr?: string;
-    con?: string;
-    dataSource?: any;
-    dictionarieObj?: any;
-    explicitRequired?: number;
-    explicitDefaultVal?: string;
-    extraField?: boolean;
-    fieldSetting?: string;
-    format?: string;
-    i18n?: string;
-    id?: string;
-    inputVal?: string;
-    inputUnit?: string;
-    isAvg?: number;
-    isEdit?: number;
-    isFixed?: number;
-    isFixedShow?: number;
-    isFontWeight?: number;
-    isMerge?: number;
-    isOrder?: number;
-    isPreciseSearch?: boolean;
     isRender?: boolean;
-    isSearch?: number;
-    isShow?: number;
-    isSort?: number;
-    isSum?: number;
-    labelObj?: any;
-    labelList?: IlabelType[];
-    labelSelectList?: IlabelType[];
-    lessValue?: string | number;
-    marginx?: string;
-    notParticipatingSearch?: number;
-    order?: string;
-    QUOTE?: any;
-    searchPageConfig?: any;
-    selecteds?: any;
-    sequence?: number;
-    showDate?: boolean;
-    showFormat?: string;
-    showTime?: boolean;
-    sid?: string;
-    start_val?: number | null;
-    end_val?: number | null;
-    tempCon?: any;
-    tableId?: string;
-    value?: any;
-    unit?: string;
-    widgetCfg?: any;
-    formTitle?: string;
-    random_key?: string;
     widgetType?: any;
-    hasFieldList?: any;
-    search_DefaultValue?: any;
-};
-export declare type IlabelType = {
-    labelId?: string;
-    change_text: string;
-    field_key: string;
-    filter: IFilterItemType[];
-    label: string;
-    labelName: string;
-    sqlExpression: string;
-    value: string;
-    isSelect?: boolean;
+    con?: string;
+    _isBlock?: boolean;
+    value?: any;
+    sid?: string;
+    alias?: string;
 };
 export declare type IFilterItemType = {
     con: string;
@@ -195,10 +124,20 @@ export declare type IApiServerType = {
             name: string;
             value: any;
         }[];
+        dynamicOptionInfo?: dynamicOptionInfoType;
     };
+    rangeFilter?: boolean;
     remark?: string;
     keyword?: boolean;
 };
+export declare type dynamicOptionInfoType = {
+    filterKeys: string[];
+    showKeys: string[];
+    valueKey: string;
+    dataSourceId: string;
+    dataSourceType: string;
+    autograph: string;
+};
 export declare type ICategoryItemType = {
     disabled: boolean;
     value: string;

package/es/shared/package.json.js

@@ -1 +1 @@
-var e="@cnhis-design-vue/shared",i="3.1.43-beta.3",s="index.ts",n={"naive-ui":"^2.30.0",vue:"^3.2.0"},a={"@vicons/ionicons5":"^0.12.0","lodash-es":"^4.17.21",moment:"^2.29.1","video.js":"^7.19.2","videojs-contrib-hls":"^5.15.0",viewerjs:"^1.10.5","xe-utils":"^3.5.4"},d={name:e,version:"3.1.43-beta.3",private:!0,main:"index.ts",peerDependencies:n,dependencies:a};export{d as default,a as dependencies,s as main,e as name,n as peerDependencies,i as version};
+var e="@cnhis-design-vue/shared",i="3.1.43-beta.6",s="index.ts",n={"naive-ui":"^2.30.0",vue:"^3.2.0"},a={"@vicons/ionicons5":"^0.12.0","lodash-es":"^4.17.21",moment:"^2.29.1","video.js":"^7.19.2","videojs-contrib-hls":"^5.15.0",viewerjs:"^1.10.5","xe-utils":"^3.5.4"},d={name:e,version:"3.1.43-beta.6",private:!0,main:"index.ts",peerDependencies:n,dependencies:a};export{d as default,a as dependencies,s as main,e as name,n as peerDependencies,i as version};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.1.43-beta.3",
+	"version": "3.1.43-beta.6",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -61,5 +61,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "d1db9ca6231216259634c9422df96f031b7d1d27"
+	"gitHead": "39b716e3b68c62c96d43df712189cf4404059047"
 }