fit2cloud-ui-plus 1.1.0 → 1.1.2

package/src/components/search-bar/FuComplexSearch.vue

@@ -71,7 +71,7 @@ function exec() {
   let conditions: any = [];
   references?.value.forEach(r => {
     let condition = r.getCondition()
-    if (condition && condition.value !== undefined) {
+    if (condition?.value !== undefined) {
       conditions.push(condition)
     }
   })

package/src/components/search-bar/FuQuickSearch.vue

@@ -11,7 +11,7 @@
 
 
 <script setup lang="ts">
-import {computed, ref, watch} from "vue";
+import {computed, ref} from "vue";
 import {validateSize} from "@/tools/size";
 import {useSize} from "@/hooks";
 

package/src/components/search-bar/complex-components/FuComplexDateTime.vue

@@ -2,7 +2,6 @@
   <div class="fu-complex-component">
     <div class="fu-complex-component__label">{{ label }}</div>
     <div class="fu-complex-component__content">
-      <!-- :size="configSize"  -->
       <el-date-picker class="fu-complex-date-time" v-model="value" v-bind="$attrs" :size="configSize"
                       :placeholder="t('fu.search_bar.select_date_time')" type="datetimerange"
                       :value-format="valueFormat"

package/src/components/speed-dial/FuSpeedDial.vue

@@ -135,7 +135,7 @@ const hashChildren = computed(() => {
   if (props.items && props.items.length > 0) {
     return true
   }
-  return slots && slots.default
+  return slots?.default
 })
 const config = computed(() => {
   return props.sizeOptions[props.size] || props.sizeOptions["default"]
@@ -212,8 +212,8 @@ function mousemove(e: MouseEvent) {
   if (props.position === "absolute") {
     const {offsetLeft, offsetTop, clientWidth, clientHeight, offsetParent} = instance?.vnode.el as HTMLElement
 
-    const maxWidth = offsetParent && offsetParent.clientWidth || 0 - clientWidth
-    const maxHeight = offsetParent && offsetParent.clientHeight || 0 - clientHeight
+    const maxWidth = offsetParent?.clientWidth ?? 0 - clientWidth
+    const maxHeight = offsetParent?.clientHeight ?? 0 - clientHeight
 
     let left = offsetLeft + e.movementX
     let top = offsetTop + e.movementY

package/src/components/speed-dial/FuSpeedDialActionButton.vue

@@ -44,9 +44,6 @@ const config = computed(() => {
 const direction = computed(() => {
   return speedDialKey?.direction.value || "";
 })
-// const clickClose =computed(()=>{
-//     return FuSpeedDial.clickClose;
-// })
 
 const titleSize = computed(() => {
   let size = config.value?.fab.size + "px";

package/src/components/{ steps/FuVerticalNavigation.vue → steps/FuVerticalNavigation.vue}

@@ -17,7 +17,7 @@
 <script lang="ts" setup>
 import type { PropType } from 'vue'
 import { computed } from "vue";
-import {Step} from "@/components/ steps/Stepper";
+import {Step} from "@/components/steps/Stepper";
 const props = defineProps({
   stepper: Object,
   steps: Array as PropType<Step[]>,

package/src/components/{ steps/Stepper.ts → steps/Stepper.ts}

@@ -20,24 +20,24 @@ export class Stepper implements StepperOptions {
   height: string;
 
   constructor(options?: StepperOptions) {
-    options = options || ({} as StepperOptions);
+    options ??= {} as StepperOptions;
     // 所有步骤节点(Step对象数组)
     this.steps = options.steps;
     // 正在执行的节点的索引
-    this.index = options.index === undefined ? 0 : options.index;
+    this.index = options.index ?? 0;
     // 激活过的节点的索引
     this.activeSet = new Set();
     // loading状态
-    this.isLoading = options?.isLoading || false;
+    this.isLoading = options.isLoading ?? false;
     // footer 属性
-    this.onCancelButtonText = options.onCancelButtonText || t('fu.steps.cancel');
-    this.onFinishButtonText = options.onFinishButtonText || t('fu.steps.finish');
-    this.prevButtonText = options.prevButtonText || t('fu.steps.prev');
-    this.nextButtonText = options.nextButtonText || t('fu.steps.next');
-    this.buttonSize = options.buttonSize || 'default';
-    this.footerAlign = options.footerAlign || 'flex';
+    this.onCancelButtonText = options.onCancelButtonText ?? t('fu.steps.cancel');
+    this.onFinishButtonText = options.onFinishButtonText ?? t('fu.steps.finish');
+    this.prevButtonText = options.prevButtonText ?? t('fu.steps.prev');
+    this.nextButtonText = options.nextButtonText ?? t('fu.steps.next');
+    this.buttonSize = options.buttonSize ?? 'default';
+    this.footerAlign = options.footerAlign ?? 'flex';
     // 是否显示取消按钮
-    this.showCancel = options.showCancel === undefined ? false : options.showCancel;
+    this.showCancel = options.showCancel ?? false;
     // 激活前钩子
     this.beforeActive = options.beforeActive;
     // 离开前钩子
@@ -84,11 +84,6 @@ export class Stepper implements StepperOptions {
     }
   }
 
-  // 反激活
-  // inactive(index: number): void {
-  //   this.activeSet.delete(index);
-  // }
-
   // 下一步
   next(): void {
     if (!this.isLast(this.index)) {
@@ -110,19 +105,6 @@ export class Stepper implements StepperOptions {
     }
   }
 
-  // 使用ID获取节点索引
-  // getIndex(id: string): number {
-  //   if (this.steps) {
-  //     for (let i = 0; i < this.steps.length; i++) {
-  //       let step: any = this.steps[i];
-  //       if (id === step.id) {
-  //         return i;
-  //       }
-  //     }
-  //   }
-  //   return -1;
-  // }
-
   executeBeforeLeave(index: number, forward: boolean) {
     const step: any = this.getStep(index);
     if (step.beforeLeave) {
@@ -155,7 +137,7 @@ export class Step implements StepOptions {
   status?: string;
 
   constructor(options?: StepOptions) {
-    options = options || ({} as StepOptions);
+    options ??= {} as StepOptions;
     this.id = options.id;
     this.index = options.index;
     // 激活前钩子

package/src/components/{ steps/types.ts → steps/types.ts}

@@ -1,4 +1,4 @@
-import {Step} from "@/components/ steps/Stepper";
+import {Step} from "@/components/steps/Stepper";
 
 export interface StepperOptions {
   steps: [Step]

package/src/components/table/FuTableColumnDropdown.vue

@@ -32,8 +32,7 @@
   </el-table-column>
 </template>
 <script lang="ts" setup>
-import { computed, getCurrentInstance } from "vue";
-import { PropType } from "vue";
+import { computed, getCurrentInstance, PropType } from "vue";
 import { DropdownProps } from "@/tools/types";
 
 defineOptions({ name: "FuTableColumnDropdown" });

package/src/components/table/table-column-select/FuTableColumnSelectDialog.vue

@@ -56,7 +56,7 @@ const {t} = useLocale()
 
 const cloneColumn = (source: any, target: any) => {
   source.forEach((col: any) => {
-    target.push(Object.assign({}, col))
+    target.push({...col})
   })
   return target
 }

package/src/components/table/table-operations/FuTableMoreButton.vue

@@ -19,10 +19,10 @@
   </el-dropdown>
 </template>
 <script lang="ts" setup>
-import { computed } from "vue";
+import { computed, PropType } from "vue";
 import { useLocale } from "@/hooks"
-import { PropType } from "vue";
 import { DropdownProps } from "@/tools/types";
+
 defineOptions({ name: "FuTableMoreButton" });
 const { t } = useLocale()
 const props = defineProps({

package/src/components/tabs/FuTabs.vue

@@ -41,7 +41,6 @@
 <script lang="ts" setup>
 import { PropType } from "vue";
 import { DropdownProps } from "@/tools/types";
-import { uuid } from "@/tools/utils";
 defineOptions({ name: "FuTabs" });
 type TabPanelName = string | number
 const props = defineProps({
@@ -69,7 +68,7 @@ const props = defineProps({
 const emit = defineEmits(["command"])
 
 function handleCommand(e: any) {
-  const name = uuid();
+  const name = crypto.randomUUID();
   let obj = null;
   if (e) {
     obj = props.dropdownMenus.find((item: any) => item.command === e);

package/src/tools/size.ts

@@ -2,5 +2,5 @@ const COMPONENTS_SIZE = ['', 'default', 'small', 'large'];
 
 export type ComponentSize = typeof COMPONENTS_SIZE[number]
 
-export const validateSize = (val: string): val is ComponentSize | '' =>
-['', ...COMPONENTS_SIZE].includes(val)
+export const validateSize = (val: string): val is ComponentSize =>
+["", ...COMPONENTS_SIZE].includes(val)

package/types/src/components/{ steps/FuVerticalNavigation.vue.d.ts → steps/FuVerticalNavigation.vue.d.ts}

@@ -1,5 +1,5 @@
 import type { PropType } from 'vue';
-import { Step } from "@/components/ steps/Stepper";
+import { Step } from "@/components/steps/Stepper";
 declare const _default: import("vue").DefineComponent<{
     stepper: ObjectConstructor;
     steps: PropType<Step[]>;

package/types/src/components/{ steps/types.d.ts → steps/types.d.ts}

@@ -1,4 +1,4 @@
-import { Step } from "@/components/ steps/Stepper";
+import { Step } from "@/components/steps/Stepper";
 export interface StepperOptions {
     steps: [Step];
     index: number;

package/src/tools/utils.ts

@@ -1,60 +0,0 @@
-// export const download = function ({url, name, content}) {
-//   if (url) {
-//     downloadByURL(url)
-//   } else {
-//     downloadByContent(name, content)
-//   }
-// }
-
-// export const downloadByContent = function (name, content) {
-//   const blob = new Blob([content])
-//   const a = document.createElement('a')
-//   a.setAttribute('href', window.URL.createObjectURL(blob))
-//   a.setAttribute('download', name)
-//   document.body.appendChild(a)
-//   a.click()
-//   document.body.removeChild(a)
-// }
-
-// export const downloadByURL = function (url) {
-//   const a = document.createElement('a')
-//   a.setAttribute('href', url)
-//   a.setAttribute('download', url)
-//   document.body.appendChild(a)
-//   a.click()
-//   document.body.removeChild(a)
-// }
-
-export const uuid = function () {
-  let d = new Date().getTime();
-  let d2 = (performance && performance.now && (performance.now() * 1000)) || 0;
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-    let r = Math.random() * 16;
-    if (d > 0) {
-      r = (d + r) % 16 | 0;
-      d = Math.floor(d / 16);
-    } else {
-      r = (d2 + r) % 16 | 0;
-      d2 = Math.floor(d2 / 16);
-    }
-    return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16);
-  });
-};
-
-export const randomId = function () {
-  return Math.floor(Math.random() * 10000);
-}
-
-// export const hasOwn = function (obj, key) {
-//   return Object.prototype.hasOwnProperty.call(obj, key);
-// }
-
-// export const convertToUnit = function (value, unit = "px") {
-//   if (value == null || value === '') {
-//     return undefined
-//   } else if (isNaN(+value)) {
-//     return String(value)
-//   } else {
-//     return `${Number(value)}${unit}`
-//   }
-// }

package/types/src/tools/utils.d.ts

@@ -1,2 +0,0 @@
-export declare const uuid: () => string;
-export declare const randomId: () => number;