ci-plus 1.1.0 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ci-plus",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "ci组件库",
   "main": "./index.ts",
   "scripts": {

package/src/selectSuffix/selectSuffix.vue

@@ -17,6 +17,7 @@
       :props="props.prop"
       :height="200"
       :disabled="props.disabled"
+      :loading="select_loading"
       v-bind="$attrs"
     >
       <template #prefix>
@@ -26,6 +27,11 @@
           </el-icon>
         </span>
       </template>
+      <template #loading>
+        <svg class="circular" viewBox="0 0 50 50">
+          <circle class="path" cx="25" cy="25" r="20" fill="none" />
+        </svg>
+      </template>
     </el-select-v2>
     <el-dialog
       class="L-dialog"
@@ -160,6 +166,7 @@ const basic = reactive<Basic>({
   is_dialogTable: false,
   search: ''
 })
+const select_loading = ref(false)
 const is_aim = ref(false)
 const tagLabel = ref('')
 const tableData = ref<AnyO[]>([])
@@ -242,7 +249,8 @@ const getTableData = (obj = {}, page1 = false) => {
   getAxios(obj, page1).then((res) => {
     if (res.code !== 200) return ElMessage.warning(res.msg)
     basic.count = res.count
-    tableData.value = res.data
+    if (props.getData) tableData.value = props.getData(res.data) || []
+    else tableData.value = res.data || []
     setCurrent()
   })
 }
@@ -291,6 +299,7 @@ const getAxios = async (obj = {}, page1 = false): Promise<any> => {
 }
 const getOptions = (val: string) => {
   if (!val) return
+  select_loading.value = true
   let searchObj: AnyO = {}
   searchObj[props.searchKey ? props.searchKey : 'search'] = val
   axios({
@@ -303,10 +312,14 @@ const getOptions = (val: string) => {
   })
     .then((res_) => {
       let res = res_.data
+      select_loading.value = false
       if (res.code !== 200) return ElMessage.warning(res.msg)
+      if (props.getData) temporary_options.value = props.getData(res.data) || []
+      else temporary_options.value = res.data || []
       temporary_options.value = res.data
     })
     .catch((err) => {
+      select_loading.value = false
       ElMessage.error(err.code)
     })
 }
@@ -332,4 +345,21 @@ const getOptions = (val: string) => {
 .el-table .success-row {
   --el-table-tr-bg-color: #cdedff;
 }
+
+.circular {
+  margin-top: 5px;
+  display: inline;
+  height: 30px;
+  width: 30px;
+  animation: loading-rotate 2s linear infinite;
+}
+
+.path {
+  animation: loading-dash 1.5s ease-in-out infinite;
+  stroke-dasharray: 90, 150;
+  stroke-dashoffset: 0;
+  stroke-width: 2;
+  stroke: var(--el-color-primary);
+  stroke-linecap: round;
+}
 </style>

package/src/selectSuffix/types.ts

@@ -3,43 +3,44 @@ import { TableColumnInstance, ColumnCls } from 'element-plus'
 import { AxiosRequestConfig } from 'axios';
 export type Props<T> = Partial<Omit<T, `$${string}` | `_${string}` | '$' | '_'>>
 export interface Scope<T> {
-  row: T,
-  $index: number,
-  column: ColumnCls<T>
+    row: T,
+    $index: number,
+    column: ColumnCls<T>
 }
 export interface AnyO {
-  [key: string]: any
+    [key: string]: any
 }
 export interface SelectColumn {
-  col: Props<TableColumnInstance>
-  scope?(props: any): string
-  component?: (createVNode: typeof h, data: Scope<any>) => ComponentIns
+    col: Props<TableColumnInstance>
+    scope?(props: any): string
+    component?: (createVNode: typeof h, data: Scope<any>) => ComponentIns
 }
 export interface SelectSuffix {
-  title?: string  //弹出层标题
-  modelValue?: string | string[] //下拉框value
-  columns: SelectColumn[] // 表格列配置
-  mul?: boolean //多选
-  aim?: boolean
-  disabled?: boolean
-  size?: "" | "default" | "small" | "large"
-  prop: {   //下拉框字段
-    label: string
-    value: string
-  }
-  where?: {  //弹出层打开需要展示Label的请求的params
-    [key: string]: string
-  }
-  axiosConfig: AxiosRequestConfig //Axios请求配置
-  isExist?: boolean  // 是否选中关闭，单选默认true，多选默认false
-  searchKey?: string // 模糊搜索字段，默认search,
-  // selectConfig?:Props<ISelectV2Props>
+    title?: string  //弹出层标题
+    modelValue?: string | string[] //下拉框value
+    columns: SelectColumn[] // 表格列配置
+    mul?: boolean //多选
+    aim?: boolean
+    disabled?: boolean
+    size?: "" | "default" | "small" | "large"
+    prop: {   //下拉框字段
+        label: string
+        value: string
+    }
+    where?: {  //弹出层打开需要展示Label的请求的params
+        [key: string]: string
+    }
+    axiosConfig: AxiosRequestConfig //Axios请求配置
+    isExist?: boolean  // 是否选中关闭，单选默认true，多选默认false
+    searchKey?: string // 模糊搜索字段，默认search,
+    // selectConfig?:Props<ISelectV2Props> 
+    getData?: (params: any) => any[] // 获取数据的方法::getData="(data: any) => data.data"
 }
 export interface Basic {
-  page: number
-  limit: number
-  count: number
-  is_dialogTable: boolean
-  loading: boolean
-  search: string
+    page: number
+    limit: number
+    count: number
+    is_dialogTable: boolean
+    loading: boolean
+    search: string
 }

package/src/sortableTable/utils/interface.ts

@@ -15,7 +15,7 @@ export type Props<T> = Mutable<
 >
 export type anyObj = { [key: string | number | symbol]: any }
 export interface SortColumn {
-  hide?: boolean
+  hide?: boolean //是否显示列
   ban?: boolean
   id?: number
   key?: string
@@ -47,6 +47,6 @@ export interface SortableTableIns
 export interface SortableTableDialog {
   config?: /* @vue-ignore */
   | Props<InstanceType<typeof ElDialog>>
-    | /* @vue-ignore */ Ref<Props<InstanceType<typeof ElDialog>>>['value']
+  | /* @vue-ignore */ Ref<Props<InstanceType<typeof ElDialog>>>['value']
   modelValue: SortColumn[] | Ref<SortColumn[]>['value']
 }