giime 0.2.0 → 0.2.2

package/lib/components/src/composite/importDialog/ImportDialog.vue2.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var vue = require('vue');
 var elementPlus = require('element-plus');
+var exports$1 = require('../../../../utils/src/elementPlus/exports.js');
 var iconsVue = require('@element-plus/icons-vue');
 var importDialog = require('./importDialog.js');
 
@@ -36,6 +37,9 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       uploadRef.value.handleStart(file);
     };
     const submitUpload = () => {
+      if (fileList.value.length === 0) {
+        return GmMessage.error("\u8BF7\u9009\u62E9\u6587\u4EF6");
+      }
       uploadRef.value.submit();
     };
     const dialogVisible = vue.ref(false);
@@ -59,13 +63,22 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       return props.onSuccess(response, uploadFile, uploadFiles);
     }
     const handleError = (error, uploadFile, uploadFiles) => {
+      const file = uploadFile.raw;
+      if (props.errorReselect && file) {
+        file.uid = elementPlus.genFileId();
+        uploadRef.value?.handleStart(file);
+      }
       uploadLoading.value = false;
       return props.onError(error, uploadFile, uploadFiles);
     };
+    const exposeNames = ["abort", "submit", "clearFiles", "handleStart", "handleRemove"];
+    const { exposeFns } = exports$1.getGmExports(uploadRef, exposeNames);
     __expose({
       openDialog,
       closeDialog,
-      reset
+      reset,
+      ...exposeFns
+      // handleStart: (rawFile: UploadRawFile) => uploadRef.value?.handleStart(rawFile),
     });
     return (_ctx, _cache) => {
       const _component_gm_button = vue.resolveComponent("gm-button");
@@ -121,7 +134,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
                   "on-error": handleError,
                   "before-upload": _ctx.beforeUpload,
                   "auto-upload": false,
-                  class: "gm-px-6"
+                  class: "gmUploadEl gm-px-6"
                 }, {
                   tip: vue.withCtx(() => [
                     _hoisted_3

package/lib/components/src/composite/importDialog/ImportDialog.vue2.js.map

@@ -1 +1 @@
-{"version":3,"file":"ImportDialog.vue2.js","sources":["../../../../../../../packages/components/src/composite/importDialog/ImportDialog.vue"],"sourcesContent":["<template>\r\n  <!-- 导入对话框 -->\r\n  <gm-dialog v-model=\"dialogVisible\" title=\"导入\" width=\"500px\" append-to-body>\r\n    <div class=\" \">\r\n      <gm-upload\r\n        ref=\"uploadRef\"\r\n        v-model:file-list=\"fileList\"\r\n        action=\"\"\r\n        :limit=\"1\"\r\n        :accept=\"accept\"\r\n        :http-request=\"httpRequest\"\r\n        :on-exceed=\"handleExceed\"\r\n        :on-success=\"handleSuccess\"\r\n        :on-error=\"handleError\"\r\n        :before-upload=\"beforeUpload\"\r\n        :auto-upload=\"false\"\r\n        class=\"gm-px-6\"\r\n      >\r\n        <div class=\"gm-flex gm-items-center\">\r\n          <gm-button type=\"primary\" :icon=\"Download\" @click.stop=\"emit('downloadTemplate')\"> 下载导入模板 </gm-button>\r\n          <gm-button type=\"primary\" :icon=\"Upload\" style=\"margin-left: 36px\">选择文件导入</gm-button>\r\n        </div>\r\n\r\n        <!-- <el-button class=\"ml-3\" type=\"success\" @click=\"submitUpload\"> upload to server </el-button> -->\r\n        <template #tip>\r\n          <div class=\"el-upload__tip gm-text-red-500\">限制1个文件，新文件将覆盖旧文件</div>\r\n        </template>\r\n      </gm-upload>\r\n    </div>\r\n\r\n    <template #footer>\r\n      <div class=\"dialog-footer\">\r\n        <gm-button type=\"primary\" :loading=\"uploadLoading\" @click=\"submitUpload\">确 定</gm-button>\r\n        <gm-button @click=\"closeDialog\">取 消</gm-button>\r\n      </div>\r\n    </template>\r\n  </gm-dialog>\r\n</template>\r\n<script lang=\"ts\" setup>\r\nimport { ref } from 'vue';\r\nimport { genFileId } from 'element-plus';\r\nimport { Download, Upload } from '@element-plus/icons-vue';\r\nimport { importDialogEmits, importDialogProps } from './importDialog';\r\nimport type { UploadInstance } from '../../base/upload';\r\nimport type { UploadFile, UploadFiles, UploadProps, UploadRawFile, UploadRequestOptions, UploadUserFile } from 'element-plus';\r\n\r\ndefineOptions({\r\n  name: 'GmImportDialog',\r\n});\r\nconst props = defineProps(importDialogProps);\r\nconst emit = defineEmits(importDialogEmits);\r\n\r\nconst fileList = ref<UploadUserFile[]>([]);\r\nconst uploadRef = ref<UploadInstance>();\r\n\r\nconst handleExceed: UploadProps['onExceed'] = files => {\r\n  uploadRef.value!.clearFiles();\r\n  const file = files[0] as UploadRawFile;\r\n  file.uid = genFileId();\r\n  uploadRef.value!.handleStart(file);\r\n};\r\n\r\nconst submitUpload = () => {\r\n  uploadRef.value!.submit();\r\n};\r\n/**\r\n * 编辑表单\r\n */\r\n// const dialogVisible = defineModel<boolean>('dialogVisible', { required: true });\r\nconst dialogVisible = ref(false);\r\n\r\n/** 新增按钮操作 */\r\nconst openDialog = () => {\r\n  dialogVisible.value = true;\r\n};\r\n/** 取消按钮 */\r\nfunction closeDialog() {\r\n  dialogVisible.value = false;\r\n  reset();\r\n}\r\n/** 表单重置 */\r\nfunction reset() {\r\n  fileList.value = [];\r\n}\r\n\r\nconst uploadLoading = ref(false);\r\nconst httpRequest = (options: UploadRequestOptions) => {\r\n  uploadLoading.value = true;\r\n  return props.httpRequest(options);\r\n};\r\n// 上传成功\r\nfunction handleSuccess(response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) {\r\n  uploadLoading.value = false;\r\n  return props.onSuccess(response, uploadFile, uploadFiles);\r\n}\r\n// 上传失败\r\nconst handleError = (error: Error, uploadFile: UploadFile, uploadFiles: UploadFiles) => {\r\n  uploadLoading.value = false;\r\n  return props.onError(error, uploadFile, uploadFiles);\r\n};\r\ndefineExpose({\r\n  openDialog,\r\n  closeDialog,\r\n  reset,\r\n});\r\n</script>\r\n"],"names":["ref","genFileId"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAiDA,IAAA,MAAM,KAAQ,GAAA,OAAA,CAAA;AACd,IAAA,MAAM,IAAO,GAAA,MAAA,CAAA;AAEb,IAAM,MAAA,QAAA,GAAWA,OAAsB,CAAA,EAAE,CAAA,CAAA;AACzC,IAAA,MAAM,YAAYA,OAAoB,EAAA,CAAA;AAEtC,IAAA,MAAM,eAAwC,CAAS,KAAA,KAAA;AACrD,MAAA,SAAA,CAAU,MAAO,UAAW,EAAA,CAAA;AAC5B,MAAM,MAAA,IAAA,GAAO,MAAM,CAAC,CAAA,CAAA;AACpB,MAAA,IAAA,CAAK,MAAMC,qBAAU,EAAA,CAAA;AACrB,MAAU,SAAA,CAAA,KAAA,CAAO,YAAY,IAAI,CAAA,CAAA;AAAA,KACnC,CAAA;AAEA,IAAA,MAAM,eAAe,MAAM;AACzB,MAAA,SAAA,CAAU,MAAO,MAAO,EAAA,CAAA;AAAA,KAC1B,CAAA;AAKA,IAAM,MAAA,aAAA,GAAgBD,QAAI,KAAK,CAAA,CAAA;AAG/B,IAAA,MAAM,aAAa,MAAM;AACvB,MAAA,aAAA,CAAc,KAAQ,GAAA,IAAA,CAAA;AAAA,KACxB,CAAA;AAEA,IAAA,SAAS,WAAc,GAAA;AACrB,MAAA,aAAA,CAAc,KAAQ,GAAA,KAAA,CAAA;AACtB,MAAM,KAAA,EAAA,CAAA;AAAA,KACR;AAEA,IAAA,SAAS,KAAQ,GAAA;AACf,MAAA,QAAA,CAAS,QAAQ,EAAC,CAAA;AAAA,KACpB;AAEA,IAAM,MAAA,aAAA,GAAgBA,QAAI,KAAK,CAAA,CAAA;AAC/B,IAAM,MAAA,WAAA,GAAc,CAAC,OAAkC,KAAA;AACrD,MAAA,aAAA,CAAc,KAAQ,GAAA,IAAA,CAAA;AACtB,MAAO,OAAA,KAAA,CAAM,YAAY,OAAO,CAAA,CAAA;AAAA,KAClC,CAAA;AAEA,IAAS,SAAA,aAAA,CAAc,QAAe,EAAA,UAAA,EAAwB,WAA0B,EAAA;AACtF,MAAA,aAAA,CAAc,KAAQ,GAAA,KAAA,CAAA;AACtB,MAAA,OAAO,KAAM,CAAA,SAAA,CAAU,QAAU,EAAA,UAAA,EAAY,WAAW,CAAA,CAAA;AAAA,KAC1D;AAEA,IAAA,MAAM,WAAc,GAAA,CAAC,KAAc,EAAA,UAAA,EAAwB,WAA6B,KAAA;AACtF,MAAA,aAAA,CAAc,KAAQ,GAAA,KAAA,CAAA;AACtB,MAAA,OAAO,KAAM,CAAA,OAAA,CAAQ,KAAO,EAAA,UAAA,EAAY,WAAW,CAAA,CAAA;AAAA,KACrD,CAAA;AACA,IAAa,QAAA,CAAA;AAAA,MACX,UAAA;AAAA,MACA,WAAA;AAAA,MACA,KAAA;AAAA,KACD,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"ImportDialog.vue2.js","sources":["../../../../../../../packages/components/src/composite/importDialog/ImportDialog.vue"],"sourcesContent":["<template>\r\n  <!-- 导入对话框 -->\r\n  <gm-dialog v-model=\"dialogVisible\" title=\"导入\" width=\"500px\" append-to-body>\r\n    <div class=\" \">\r\n      <gm-upload\r\n        ref=\"uploadRef\"\r\n        v-model:file-list=\"fileList\"\r\n        action=\"\"\r\n        :limit=\"1\"\r\n        :accept=\"accept\"\r\n        :http-request=\"httpRequest\"\r\n        :on-exceed=\"handleExceed\"\r\n        :on-success=\"handleSuccess\"\r\n        :on-error=\"handleError\"\r\n        :before-upload=\"beforeUpload\"\r\n        :auto-upload=\"false\"\r\n        class=\"gmUploadEl gm-px-6\"\r\n      >\r\n        <div class=\"gm-flex gm-items-center\">\r\n          <gm-button type=\"primary\" :icon=\"Download\" @click.stop=\"emit('downloadTemplate')\"> 下载导入模板 </gm-button>\r\n          <gm-button type=\"primary\" :icon=\"Upload\" style=\"margin-left: 36px\">选择文件导入</gm-button>\r\n        </div>\r\n\r\n        <!-- <el-button class=\"ml-3\" type=\"success\" @click=\"submitUpload\"> upload to server </el-button> -->\r\n        <template #tip>\r\n          <div class=\"el-upload__tip gm-text-red-500\">限制1个文件，新文件将覆盖旧文件</div>\r\n        </template>\r\n      </gm-upload>\r\n    </div>\r\n\r\n    <template #footer>\r\n      <div class=\"dialog-footer\">\r\n        <gm-button type=\"primary\" :loading=\"uploadLoading\" @click=\"submitUpload\">确 定</gm-button>\r\n        <gm-button @click=\"closeDialog\">取 消</gm-button>\r\n      </div>\r\n    </template>\r\n  </gm-dialog>\r\n</template>\r\n<script lang=\"ts\" setup>\r\nimport { ref } from 'vue';\r\nimport { genFileId } from 'element-plus';\r\nimport { getGmExports } from '@giime/utils/src/elementPlus/exports';\r\nimport { Download, Upload } from '@element-plus/icons-vue';\r\nimport { importDialogEmits, importDialogProps } from './importDialog';\r\nimport type { UploadInstance } from '../../base/upload';\r\nimport type { UploadFile, UploadFiles, UploadProps, UploadRawFile, UploadRequestOptions, UploadUserFile } from 'element-plus';\r\n\r\ndefineOptions({\r\n  name: 'GmImportDialog',\r\n});\r\nconst props = defineProps(importDialogProps);\r\nconst emit = defineEmits(importDialogEmits);\r\n\r\nconst fileList = ref<UploadUserFile[]>([]);\r\nconst uploadRef = ref<UploadInstance>();\r\n\r\nconst handleExceed: UploadProps['onExceed'] = files => {\r\n  uploadRef.value!.clearFiles();\r\n  const file = files[0] as UploadRawFile;\r\n  file.uid = genFileId();\r\n  uploadRef.value!.handleStart(file);\r\n};\r\n\r\nconst submitUpload = () => {\r\n  if (fileList.value.length === 0) {\r\n    return GmMessage.error('请选择文件');\r\n  }\r\n  uploadRef.value!.submit();\r\n};\r\n/**\r\n * 编辑表单\r\n */\r\n// const dialogVisible = defineModel<boolean>('dialogVisible', { required: true });\r\nconst dialogVisible = ref(false);\r\n\r\n/** 新增按钮操作 */\r\nconst openDialog = () => {\r\n  dialogVisible.value = true;\r\n};\r\n/** 取消按钮 */\r\nfunction closeDialog() {\r\n  dialogVisible.value = false;\r\n  reset();\r\n}\r\n/** 表单重置 */\r\nfunction reset() {\r\n  fileList.value = [];\r\n}\r\n\r\nconst uploadLoading = ref(false);\r\nconst httpRequest = (options: UploadRequestOptions) => {\r\n  uploadLoading.value = true;\r\n  return props.httpRequest(options);\r\n};\r\n// 上传成功\r\nfunction handleSuccess(response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) {\r\n  uploadLoading.value = false;\r\n  return props.onSuccess(response, uploadFile, uploadFiles);\r\n}\r\n// 上传失败\r\nconst handleError = (error: Error, uploadFile: UploadFile, uploadFiles: UploadFiles) => {\r\n  const file = uploadFile.raw;\r\n  if (props.errorReselect && file) {\r\n    file.uid = genFileId();\r\n    uploadRef.value?.handleStart(file);\r\n  }\r\n  uploadLoading.value = false;\r\n  return props.onError(error, uploadFile, uploadFiles);\r\n};\r\n\r\nconst exposeNames = ['abort', 'submit', 'clearFiles', 'handleStart', 'handleRemove'] as const;\r\nconst { exposeFns } = getGmExports(uploadRef, exposeNames);\r\ndefineExpose({\r\n  openDialog,\r\n  closeDialog,\r\n  reset,\r\n  ...exposeFns,\r\n  // handleStart: (rawFile: UploadRawFile) => uploadRef.value?.handleStart(rawFile),\r\n});\r\n</script>\r\n"],"names":["ref","genFileId","getGmExports"],"mappings":"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"}

package/lib/components/src/composite/importDialog/importDialog.d.ts

@@ -39,6 +39,10 @@ export declare const importDialogProps: {
         type: StringConstructor;
         default: string;
     };
+    /**上传失败后的文件 是否重新选择，默认会被清除掉 */
+    errorReselect: {
+        type: BooleanConstructor;
+    };
 };
 export declare const importDialogEmits: {
     /**

package/lib/components/src/composite/importDialog/importDialog.js

@@ -10,6 +10,10 @@ const importDialogProps = {
   accept: {
     type: String,
     default: ".xls, .xlsx, .csv, application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, text/csv"
+  },
+  /**上传失败后的文件 是否重新选择，默认会被清除掉 */
+  errorReselect: {
+    type: Boolean
   }
 };
 const importDialogEmits = {

package/lib/components/src/composite/importDialog/importDialog.js.map

@@ -1 +1 @@
-{"version":3,"file":"importDialog.js","sources":["../../../../../../../packages/components/src/composite/importDialog/importDialog.ts"],"sourcesContent":["// import {   } from '../../base/dialog/dialog';\r\nimport { uploadProps } from '../../base/upload/upload';\r\nexport const importDialogProps = {\r\n  onSuccess: uploadProps['onSuccess'],\r\n  onError: uploadProps['onError'],\r\n  httpRequest: uploadProps['httpRequest'],\r\n  beforeUpload: uploadProps['beforeUpload'],\r\n  accept: {\r\n    type: String,\r\n    default: '.xls, .xlsx, .csv, application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, text/csv',\r\n  },\r\n};\r\n\r\nexport const importDialogEmits = {\r\n  /**\r\n   * 下载模板按钮点击事件\r\n   */\r\n  downloadTemplate: async () => {},\r\n};\r\n"],"names":["uploadProps"],"mappings":";;;;AAEO,MAAM,iBAAoB,GAAA;AAAA,EAC/B,SAAA,EAAWA,mBAAY,WAAW,CAAA;AAAA,EAClC,OAAA,EAASA,mBAAY,SAAS,CAAA;AAAA,EAC9B,WAAA,EAAaA,mBAAY,aAAa,CAAA;AAAA,EACtC,YAAA,EAAcA,mBAAY,cAAc,CAAA;AAAA,EACxC,MAAQ,EAAA;AAAA,IACN,IAAM,EAAA,MAAA;AAAA,IACN,OAAS,EAAA,0HAAA;AAAA,GACX;AACF,EAAA;AAEO,MAAM,iBAAoB,GAAA;AAAA;AAAA;AAAA;AAAA,EAI/B,kBAAkB,YAAY;AAAA,GAAC;AACjC;;;;;"}
+{"version":3,"file":"importDialog.js","sources":["../../../../../../../packages/components/src/composite/importDialog/importDialog.ts"],"sourcesContent":["// import {   } from '../../base/dialog/dialog';\r\nimport { uploadProps } from '../../base/upload/upload';\r\nexport const importDialogProps = {\r\n  onSuccess: uploadProps['onSuccess'],\r\n  onError: uploadProps['onError'],\r\n  httpRequest: uploadProps['httpRequest'],\r\n  beforeUpload: uploadProps['beforeUpload'],\r\n  accept: {\r\n    type: String,\r\n    default: '.xls, .xlsx, .csv, application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, text/csv',\r\n  },\r\n  /**上传失败后的文件 是否重新选择，默认会被清除掉 */\r\n  errorReselect: {\r\n    type: Boolean,\r\n  },\r\n};\r\n\r\nexport const importDialogEmits = {\r\n  /**\r\n   * 下载模板按钮点击事件\r\n   */\r\n  downloadTemplate: async () => {},\r\n};\r\n"],"names":["uploadProps"],"mappings":";;;;AAEO,MAAM,iBAAoB,GAAA;AAAA,EAC/B,SAAA,EAAWA,mBAAY,WAAW,CAAA;AAAA,EAClC,OAAA,EAASA,mBAAY,SAAS,CAAA;AAAA,EAC9B,WAAA,EAAaA,mBAAY,aAAa,CAAA;AAAA,EACtC,YAAA,EAAcA,mBAAY,cAAc,CAAA;AAAA,EACxC,MAAQ,EAAA;AAAA,IACN,IAAM,EAAA,MAAA;AAAA,IACN,OAAS,EAAA,0HAAA;AAAA,GACX;AAAA;AAAA,EAEA,aAAe,EAAA;AAAA,IACb,IAAM,EAAA,OAAA;AAAA,GACR;AACF,EAAA;AAEO,MAAM,iBAAoB,GAAA;AAAA;AAAA;AAAA;AAAA,EAI/B,kBAAkB,YAAY;AAAA,GAAC;AACjC;;;;;"}

package/lib/components/src/composite/importDialog/index.d.ts

@@ -40,7 +40,15 @@ export declare const GmImportDialog: import("../../../../utils").SFCWithInstall<
         type: StringConstructor;
         default: string;
     };
+    errorReselect: {
+        type: BooleanConstructor;
+    };
 }, {
+    submit: () => void;
+    abort: (file: import("element-plus").UploadFile) => void;
+    clearFiles: (states?: import("element-plus").UploadStatus[] | undefined) => void;
+    handleStart: (rawFile: import("element-plus").UploadRawFile) => void;
+    handleRemove: (file: import("element-plus").UploadRawFile | import("element-plus").UploadFile, rawFile?: import("element-plus").UploadRawFile | undefined) => void;
     openDialog: () => void;
     closeDialog: () => void;
     reset: () => void;
@@ -87,6 +95,9 @@ export declare const GmImportDialog: import("../../../../utils").SFCWithInstall<
         type: StringConstructor;
         default: string;
     };
+    errorReselect: {
+        type: BooleanConstructor;
+    };
 }>> & {
     onDownloadTemplate?: (() => any) | undefined;
 }, {
@@ -95,6 +106,7 @@ export declare const GmImportDialog: import("../../../../utils").SFCWithInstall<
     onSuccess: (response: any, uploadFile: import("element-plus").UploadFile, uploadFiles: import("element-plus").UploadFiles) => void;
     accept: string;
     httpRequest: import("element-plus").UploadRequestHandler;
+    errorReselect: boolean;
 }, {}>> & Record<string, any>;
 export type ImportDialogInstance = InstanceType<typeof ImportDialog>;
 export * from './importDialog';

package/lib/components/src/composite/index.js

@@ -2,14 +2,14 @@
 
 var index = require('./memoryForm/index.js');
 var index$1 = require('./searchForm/index.js');
-var index$6 = require('./dialogForm/index.js');
-var index$7 = require('./drawerForm/index.js');
-var index$8 = require('./formItemModule/index.js');
-var index$9 = require('./tablePro/index.js');
-var index$e = require('./operateButton/index.js');
-var index$g = require('./numberInterval/index.js');
-var index$h = require('./selectOptions/index.js');
-var index$i = require('./importDialog/index.js');
+var index$8 = require('./dialogForm/index.js');
+var index$9 = require('./drawerForm/index.js');
+var index$a = require('./formItemModule/index.js');
+var index$b = require('./tablePro/index.js');
+var index$g = require('./operateButton/index.js');
+var index$i = require('./numberInterval/index.js');
+var index$j = require('./selectOptions/index.js');
+var index$k = require('./importDialog/index.js');
 var memoryForm = require('./memoryForm/memoryForm.js');
 var searchForm = require('./searchForm/searchForm.js');
 var common = require('./searchForm/searchFormItems/common.js');
@@ -21,20 +21,24 @@ var searchFormCascader = require('./searchForm/searchFormItems/cascader/searchFo
 var index$4 = require('./searchForm/searchFormItems/cascader/index.js');
 var searchFormDatePicker = require('./searchForm/searchFormItems/datePicker/searchFormDatePicker.js');
 var index$5 = require('./searchForm/searchFormItems/datePicker/index.js');
+var searchFormSelectV2 = require('./searchForm/searchFormItems/selectV2/searchFormSelectV2.js');
+var index$6 = require('./searchForm/searchFormItems/selectV2/index.js');
+var searchFormNumberInterval = require('./searchForm/searchFormItems/numberInterval/searchFormNumberInterval.js');
+var index$7 = require('./searchForm/searchFormItems/numberInterval/index.js');
 var dialogForm = require('./dialogForm/dialogForm.js');
 var drawerForm = require('./drawerForm/drawerForm.js');
 var tablePro = require('./tablePro/tablePro.js');
 var tableColumnPro = require('./tablePro/tableColumnPro/tableColumnPro.js');
-var index$a = require('./tablePro/tableColumnPro/index.js');
+var index$c = require('./tablePro/tableColumnPro/index.js');
 var tableHeaderForm = require('./tablePro/tableHeaderForm/tableHeaderForm.js');
-var index$b = require('./tablePro/tableHeaderForm/index.js');
+var index$d = require('./tablePro/tableHeaderForm/index.js');
 var tablePagination = require('./tablePro/tablePagination/tablePagination.js');
-var index$c = require('./tablePro/tablePagination/index.js');
+var index$e = require('./tablePro/tablePagination/index.js');
 var tableToolbar = require('./tablePro/tableToolbar/tableToolbar.js');
-var index$d = require('./tablePro/tableToolbar/index.js');
+var index$f = require('./tablePro/tableToolbar/index.js');
 var operateButton = require('./operateButton/operateButton.js');
 var operateButtonForm = require('./operateButton/operateButtonForm/operateButtonForm.js');
-var index$f = require('./operateButton/operateButtonForm/index.js');
+var index$h = require('./operateButton/operateButtonForm/index.js');
 var numberInterval = require('./numberInterval/numberInterval.js');
 var selectOptions = require('./selectOptions/selectOptions.js');
 var importDialog = require('./importDialog/importDialog.js');
@@ -43,14 +47,14 @@ var importDialog = require('./importDialog/importDialog.js');
 
 exports.GmMemoryForm = index.GmMemoryForm;
 exports.GmSearchForm = index$1.GmSearchForm;
-exports.GmDialogForm = index$6.GmDialogForm;
-exports.GmDrawerForm = index$7.GmDrawerForm;
-exports.GmFormItemModule = index$8.GmFormItemModule;
-exports.GmTablePro = index$9.GmTablePro;
-exports.GmOperateButton = index$e.GmOperateButton;
-exports.GmNumberInterval = index$g.GmNumberInterval;
-exports.GmSelectOptions = index$h.GmSelectOptions;
-exports.GmImportDialog = index$i.GmImportDialog;
+exports.GmDialogForm = index$8.GmDialogForm;
+exports.GmDrawerForm = index$9.GmDrawerForm;
+exports.GmFormItemModule = index$a.GmFormItemModule;
+exports.GmTablePro = index$b.GmTablePro;
+exports.GmOperateButton = index$g.GmOperateButton;
+exports.GmNumberInterval = index$i.GmNumberInterval;
+exports.GmSelectOptions = index$j.GmSelectOptions;
+exports.GmImportDialog = index$k.GmImportDialog;
 exports.MemoryHistoryExt = memoryForm.MemoryHistoryExt;
 exports.MemoryHistoryType = memoryForm.MemoryHistoryType;
 exports.memoryFormEmits = memoryForm.memoryFormEmits;
@@ -75,6 +79,14 @@ exports.SearchFormDatePickerName = searchFormDatePicker.SearchFormDatePickerName
 exports.searchFormDatePickerEmits = searchFormDatePicker.searchFormDatePickerEmits;
 exports.searchFormDatePickerProps = searchFormDatePicker.searchFormDatePickerProps;
 exports.GmSearchFormDatePicker = index$5.GmSearchFormDatePicker;
+exports.SearchFormSelectV2Name = searchFormSelectV2.SearchFormSelectV2Name;
+exports.searchFormSelectV2Emits = searchFormSelectV2.searchFormSelectV2Emits;
+exports.searchFormSelectV2Props = searchFormSelectV2.searchFormSelectV2Props;
+exports.GmSearchFormSelectV2 = index$6.GmSearchFormSelectV2;
+exports.SearchFormNumberIntervalName = searchFormNumberInterval.SearchFormNumberIntervalName;
+exports.searchFormNumberIntervalEmits = searchFormNumberInterval.searchFormNumberIntervalEmits;
+exports.searchFormNumberIntervalProps = searchFormNumberInterval.searchFormNumberIntervalProps;
+exports.GmSearchFormNumberInterval = index$7.GmSearchFormNumberInterval;
 exports.dialogFormEmits = dialogForm.dialogFormEmits;
 exports.dialogFormProps = dialogForm.dialogFormProps;
 exports.drawerFormEmits = drawerForm.drawerFormEmits;
@@ -83,17 +95,17 @@ exports.tableProEmits = tablePro.tableProEmits;
 exports.tableProProps = tablePro.tableProProps;
 exports.TableColumnProName = tableColumnPro.TableColumnProName;
 exports.tableColumnProProps = tableColumnPro.tableColumnProProps;
-exports.GmTableColumnPro = index$a.GmTableColumnPro;
+exports.GmTableColumnPro = index$c.GmTableColumnPro;
 exports.tableHeaderFormProps = tableHeaderForm.tableHeaderFormProps;
-exports.GmTableHeaderForm = index$b.GmTableHeaderForm;
+exports.GmTableHeaderForm = index$d.GmTableHeaderForm;
 exports.tablePaginationProps = tablePagination.tablePaginationProps;
-exports.GmTablePagination = index$c.GmTablePagination;
+exports.GmTablePagination = index$e.GmTablePagination;
 exports.tableToolbarEmits = tableToolbar.tableToolbarEmits;
 exports.tableToolbarProps = tableToolbar.tableToolbarProps;
-exports.GmTableToolbar = index$d.GmTableToolbar;
+exports.GmTableToolbar = index$f.GmTableToolbar;
 exports.operateButtonProps = operateButton.operateButtonProps;
 exports.operateButtonFormProps = operateButtonForm.operateButtonFormProps;
-exports.GmOperateButtonForm = index$f.GmOperateButtonForm;
+exports.GmOperateButtonForm = index$h.GmOperateButtonForm;
 exports.numIntervalEmits = numberInterval.numIntervalEmits;
 exports.numIntervalProps = numberInterval.numIntervalProps;
 exports.selectOptionsEmits = selectOptions.selectOptionsEmits;

package/lib/components/src/composite/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/components/src/composite/numberInterval/NumberInterval.vue.d.ts

@@ -40,6 +40,14 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    multiple: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    clearable: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, {
     clear: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
@@ -87,12 +95,22 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    multiple: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    clearable: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & {
     onChange?: ((...args: any[]) => any) | undefined;
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
 }, {
+    clearable: boolean;
     disabled: boolean;
     separator: string;
+    multiple: boolean;
     controls: boolean;
     minPlaceholder: string;
     maxPlaceholder: string;

package/lib/components/src/composite/numberInterval/NumberInterval.vue.js

@@ -3,9 +3,10 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var NumberInterval_vue_vue_type_script_setup_true_lang = require('./NumberInterval.vue2.js');
+require('./NumberInterval.vue3.js');
 var _pluginVue_exportHelper = require('../../../../_virtual/_plugin-vue_export-helper.js');
 
-var NumberInterval = /* @__PURE__ */ _pluginVue_exportHelper.default(NumberInterval_vue_vue_type_script_setup_true_lang.default, [["__file", "NumberInterval.vue"]]);
+var NumberInterval = /* @__PURE__ */ _pluginVue_exportHelper.default(NumberInterval_vue_vue_type_script_setup_true_lang.default, [["__scopeId", "data-v-47a13fd0"], ["__file", "NumberInterval.vue"]]);
 
 exports.default = NumberInterval;
 //# sourceMappingURL=NumberInterval.vue.js.map

package/lib/components/src/composite/numberInterval/NumberInterval.vue.js.map

@@ -1 +1 @@
-{"version":3,"file":"NumberInterval.vue.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;"}
+{"version":3,"file":"NumberInterval.vue.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;"}

package/lib/components/src/composite/numberInterval/NumberInterval.vue2.js

@@ -8,8 +8,8 @@ var iconsVue = require('@element-plus/icons-vue');
 var numberInterval = require('./numberInterval.js');
 var is = require('../../../../utils/src/is.js');
 
-const _hoisted_1 = { class: "gm-w-full" };
-const _hoisted_2 = { class: "gm-flex gm-h-full gm-w-full gm-items-center gm-justify-center gm-text-[14px]" };
+const _withScopeId = (n) => (vue.pushScopeId("data-v-47a13fd0"), n = n(), vue.popScopeId(), n);
+const _hoisted_1 = { class: "gm-flex gm-h-full gm-w-full gm-items-center gm-justify-center gm-text-[14px]" };
 var _sfc_main = /* @__PURE__ */ vue.defineComponent({
   ...{
     name: "GmNumberInterval"
@@ -73,6 +73,19 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
         }
       }
     });
+    const showClear = vue.computed(() => {
+      if (!props.clearable) {
+        return false;
+      } else {
+        if (is.isString(props.modelValue) && props.modelValue) {
+          return true;
+        } else if (Array.isArray(props.modelValue) && props.modelValue.length) {
+          return true;
+        } else {
+          return false;
+        }
+      }
+    });
     const updateHandle = () => {
       const modelVal = [minVal.value, maxVal.value];
       if (is.isString(props.modelValue) && props.modelSeparator) {
@@ -86,12 +99,8 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       updateHandle();
     };
     const clear = () => {
-      if (Array.isArray(defaultModelVal)) {
-        const modelVal = [defaultModelVal?.[0], defaultModelVal?.[1]];
-        emit("update:modelValue", modelVal);
-      } else {
-        emit("update:modelValue", defaultModelVal);
-      }
+      emit("update:modelValue", defaultModelVal);
+      emit("change", defaultModelVal);
     };
     __expose({
       clear
@@ -101,107 +110,131 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       const _component_gm_input_number = vue.resolveComponent("gm-input-number");
       const _component_gm_col = vue.resolveComponent("gm-col");
       const _component_gm_row = vue.resolveComponent("gm-row");
-      return vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
-        vue.createVNode(_component_gm_row, { gutter: 5 }, {
-          default: vue.withCtx(() => [
-            vue.createVNode(_component_gm_col, { span: 11 }, {
-              default: vue.withCtx(() => [
-                vue.createVNode(_component_gm_input_number, {
-                  modelValue: minVal.value,
-                  "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => minVal.value = $event),
-                  class: "gm-w-full",
-                  "controls-position": "right",
-                  controls: _ctx.controls,
-                  min: _ctx.min,
-                  max: _ctx.max,
-                  placeholder: _ctx.minPlaceholder,
-                  disabled: _ctx.disabled || _ctx.disabledMin,
-                  onChange: changeHandle
-                }, {
-                  "decrease-icon": vue.withCtx(() => [
-                    vue.createVNode(_component_gm_icon, null, {
-                      default: vue.withCtx(() => [
-                        vue.createVNode(vue.unref(iconsVue.ArrowDown))
-                      ]),
-                      _: 1
-                      /* STABLE */
-                    })
-                  ]),
-                  "increase-icon": vue.withCtx(() => [
-                    vue.createVNode(_component_gm_icon, null, {
-                      default: vue.withCtx(() => [
-                        vue.createVNode(vue.unref(iconsVue.ArrowUp))
-                      ]),
-                      _: 1
-                      /* STABLE */
-                    })
-                  ]),
-                  _: 1
-                  /* STABLE */
-                }, 8, ["modelValue", "controls", "min", "max", "placeholder", "disabled"])
-              ]),
-              _: 1
-              /* STABLE */
-            }),
-            vue.createVNode(_component_gm_col, { span: 2 }, {
-              default: vue.withCtx(() => [
-                vue.createElementVNode("div", _hoisted_2, [
-                  vue.createElementVNode(
-                    "span",
-                    null,
-                    vue.toDisplayString(_ctx.separator),
-                    1
-                    /* TEXT */
-                  )
-                ])
-              ]),
-              _: 1
-              /* STABLE */
-            }),
-            vue.createVNode(_component_gm_col, { span: 11 }, {
-              default: vue.withCtx(() => [
-                vue.createVNode(_component_gm_input_number, {
-                  modelValue: maxVal.value,
-                  "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => maxVal.value = $event),
-                  class: "gm-w-full",
-                  "controls-position": "right",
-                  controls: _ctx.controls,
-                  min: _ctx.min,
-                  max: _ctx.max,
-                  placeholder: _ctx.maxPlaceholder,
-                  disabled: _ctx.disabled || _ctx.disabledMax,
-                  onChange: changeHandle
-                }, {
-                  "decrease-icon": vue.withCtx(() => [
-                    vue.createVNode(_component_gm_icon, null, {
-                      default: vue.withCtx(() => [
-                        vue.createVNode(vue.unref(iconsVue.ArrowDown))
-                      ]),
-                      _: 1
-                      /* STABLE */
-                    })
-                  ]),
-                  "increase-icon": vue.withCtx(() => [
+      return vue.openBlock(), vue.createElementBlock(
+        "div",
+        {
+          class: vue.normalizeClass(["gm-number-interval gm-w-full", !_ctx.multiple ? "gm-number-interval-single" : ""])
+        },
+        [
+          vue.createVNode(_component_gm_row, { gutter: 5 }, {
+            default: vue.withCtx(() => [
+              vue.createVNode(_component_gm_col, { span: 11 }, {
+                default: vue.withCtx(() => [
+                  vue.createVNode(_component_gm_input_number, {
+                    modelValue: minVal.value,
+                    "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => minVal.value = $event),
+                    class: "gm-w-full",
+                    "controls-position": "right",
+                    controls: _ctx.controls,
+                    min: _ctx.min,
+                    max: _ctx.max,
+                    placeholder: _ctx.minPlaceholder,
+                    disabled: _ctx.disabled || _ctx.disabledMin,
+                    onChange: changeHandle
+                  }, {
+                    "decrease-icon": vue.withCtx(() => [
+                      vue.createVNode(_component_gm_icon, null, {
+                        default: vue.withCtx(() => [
+                          vue.createVNode(vue.unref(iconsVue.ArrowDown))
+                        ]),
+                        _: 1
+                        /* STABLE */
+                      })
+                    ]),
+                    "increase-icon": vue.withCtx(() => [
+                      vue.createVNode(_component_gm_icon, null, {
+                        default: vue.withCtx(() => [
+                          vue.createVNode(vue.unref(iconsVue.ArrowUp))
+                        ]),
+                        _: 1
+                        /* STABLE */
+                      })
+                    ]),
+                    _: 1
+                    /* STABLE */
+                  }, 8, ["modelValue", "controls", "min", "max", "placeholder", "disabled"])
+                ]),
+                _: 1
+                /* STABLE */
+              }),
+              vue.createVNode(_component_gm_col, { span: 2 }, {
+                default: vue.withCtx(() => [
+                  vue.createElementVNode("div", _hoisted_1, [
+                    vue.createElementVNode(
+                      "span",
+                      null,
+                      vue.toDisplayString(_ctx.separator),
+                      1
+                      /* TEXT */
+                    )
+                  ])
+                ]),
+                _: 1
+                /* STABLE */
+              }),
+              vue.createVNode(_component_gm_col, {
+                span: 11,
+                class: "gm-relative"
+              }, {
+                default: vue.withCtx(() => [
+                  vue.createVNode(_component_gm_input_number, {
+                    modelValue: maxVal.value,
+                    "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => maxVal.value = $event),
+                    class: "gm-w-full",
+                    "controls-position": "right",
+                    controls: _ctx.controls,
+                    min: _ctx.min,
+                    max: _ctx.max,
+                    placeholder: _ctx.maxPlaceholder,
+                    disabled: _ctx.disabled || _ctx.disabledMax,
+                    onChange: changeHandle
+                  }, {
+                    "decrease-icon": vue.withCtx(() => [
+                      vue.createVNode(_component_gm_icon, null, {
+                        default: vue.withCtx(() => [
+                          vue.createVNode(vue.unref(iconsVue.ArrowDown))
+                        ]),
+                        _: 1
+                        /* STABLE */
+                      })
+                    ]),
+                    "increase-icon": vue.withCtx(() => [
+                      vue.createVNode(_component_gm_icon, null, {
+                        default: vue.withCtx(() => [
+                          vue.createVNode(vue.unref(iconsVue.ArrowUp))
+                        ]),
+                        _: 1
+                        /* STABLE */
+                      })
+                    ]),
+                    _: 1
+                    /* STABLE */
+                  }, 8, ["modelValue", "controls", "min", "max", "placeholder", "disabled"]),
+                  showClear.value ? (vue.openBlock(), vue.createElementBlock("div", {
+                    key: 0,
+                    class: "gm-number-interval-close gm-absolute gm-right-2 gm-top-[50%] gm-translate-y-[-50%] gm-cursor-pointer gm-items-center",
+                    onClick: clear
+                  }, [
                     vue.createVNode(_component_gm_icon, null, {
                       default: vue.withCtx(() => [
-                        vue.createVNode(vue.unref(iconsVue.ArrowUp))
+                        vue.createVNode(vue.unref(iconsVue.CircleClose))
                       ]),
                       _: 1
                       /* STABLE */
                     })
-                  ]),
-                  _: 1
-                  /* STABLE */
-                }, 8, ["modelValue", "controls", "min", "max", "placeholder", "disabled"])
-              ]),
-              _: 1
-              /* STABLE */
-            })
-          ]),
-          _: 1
-          /* STABLE */
-        })
-      ]);
+                  ])) : vue.createCommentVNode("v-if", true)
+                ]),
+                _: 1
+                /* STABLE */
+              })
+            ]),
+            _: 1
+            /* STABLE */
+          })
+        ],
+        2
+        /* CLASS */
+      );
     };
   }
 });