easybill-ui 1.0.26 → 1.0.29

package/components/ConstantStatus/src/ConstantStatus.vue

@@ -36,7 +36,7 @@ const current = computed(() => {
       label: curs.map((a) => a.label).join(","),
     }
   }
-  return (result && result.find((a) => a.value == props.value)) || {}
+  return (result && result.find((a) => a.value == props.value)) || { label: props.value }
 })
 const currentProps = computed(() => {
   const defaults = { type: "", label: "", value: "", style: {} } as OptionItem

package/components/CurdTable/src/CurdTable.vue

@@ -322,13 +322,13 @@ const onMenuOption = (optionKey: MenuEventKey, val: string) => {
         }
         if (schema.formatter) {
           let result = schema.formatter(row, schema, val, i) as string
-          if (/^[0-9\.,+-]+\.[0-9]{2}$/.test(String(result))) {
+          if (/^[0-9\.,+-]+\.[0-9]{2}$/.test(String(result)) && String(result).split(".").length < 3) {
             const resultNum = +parseFloat(String(result).replace(/,|$|￥/g, ""))
             return resultNum
           }
           return result === "--" ? "" : result
         }
-        if (/^[0-9\.,+-]+\.[0-9]{2}$/.test(String(val))) {
+        if (/^[0-9\.,+-]+\.[0-9]{2}$/.test(String(val)) && String(val).split(".").length < 3) {
           val = +parseFloat(String(val).replace(/,|$|￥/g, ""))
         }
         return val
@@ -413,10 +413,7 @@ const startremove = (scope: any) => {
     await (props.fetchRemove && props.fetchRemove(scope.row, scope.$index)).finally(() => {
       loading.close()
     })
-    ElMessage({
-      type: "success",
-      message: "删除成功",
-    })
+    ElMessage({ type: "success", message: "删除成功" })
   })
 }
 

package/components/CurdTable/src/STableItem.vue

@@ -22,8 +22,7 @@
         </template>
       </template>
       <template v-if="!props.isSlot">
-        <!-- <div v-if="props.schema.options">{{ ops }}</div> -->
-        <ConstantStatus v-if="props.schema.options" :value="scope.row[props.schema.prop]" :options="ops" />
+        <ConstantStatus v-if="props.schema.options" :value="scope.row[props.schema.prop]" :options="props.schema.options" />
         <span v-else-if="props.schema.copy">
           <el-icon class="copy" title="点击复制" @click.stop="copyValue(getValue(scope))"><CopyDocument /></el-icon>
           <span v-if="props.schema.vHtml" v-html="getValue(scope)"></span>
@@ -38,7 +37,7 @@
   </el-table-column>
 </template>
 <script lang="ts" setup>
-import { computed, inject, PropType, ref, Ref, shallowRef } from "vue"
+import { computed, inject, PropType, ref, Ref } from "vue"
 import ConstantStatus from "../../ConstantStatus"
 import STableItemFilter from "./STableItemFilter.vue"
 import STableItemHeader from "./STableItemHeader.vue"
@@ -52,7 +51,7 @@ const props = defineProps({
   schema: {
     type: Object as PropType<ColumnItem>,
     default() {
-      return {}
+      return { options: [] }
     },
   },
   isSlot: {
@@ -68,7 +67,6 @@ const props = defineProps({
     default: () => ({}),
   },
 })
-const ops = shallowRef(props.schema.options)
 const selectParams = inject<Ref<Array<ParamsItem>>>("selectParams")
 const filterSchema = computed(() => {
   let result = selectParams?.value.filter((a) => a.prop == props.schema.filter?.prop || a.prop == props.schema.prop) //getFilterFromColumn(props.schema)

package/components/FormDialog/src/FormDialog.vue

@@ -10,10 +10,10 @@
     </div>
     <template #footer>
       <span v-if="handleOk" class="dialog-footer">
-        <el-button :disabled="confirmLoading" type="default" @click="onCancel()">取消</el-button>
+        <el-button v-if="cancelBtnText" :disabled="confirmLoading" type="default" @click="onCancel()">{{ cancelBtnText }}</el-button>
         <el-button v-if="stepSchemaList.length > 1 && step > 0" :disabled="confirmLoading" type="primary" plain @click="prev">上一步</el-button>
         <el-button v-if="stepSchemaList.length > 1 && step < stepSchemaList.length - 1" :disabled="confirmLoading" type="primary" plain @click="next">下一步</el-button>
-        <el-button v-if="step >= stepSchemaList.length - 1" :disabled="confirmLoading" type="primary" :loading="confirmLoading" @click="onOk">确 定</el-button>
+        <el-button v-if="step >= stepSchemaList.length - 1" :disabled="confirmLoading" type="primary" :loading="confirmLoading" @click="onOk">{{ confirmBtnText }}</el-button>
       </span>
     </template>
   </el-dialog>
@@ -54,8 +54,13 @@ export default defineComponent({
       type: Function as PropType<(form: Fields) => void>,
       default: null,
     },
+    // 点击确定
     handleOk: {
-      // 点击确定
+      type: Function,
+      default: null,
+    },
+    // 关闭的回调,通过类型判断是点取消按钮还是右上角关闭按钮
+    handleClose: {
       type: Function,
       default: null,
     },
@@ -67,6 +72,14 @@ export default defineComponent({
       type: Object,
       default: () => ({}),
     },
+    confirmBtnText: {
+      type: String,
+      default: "确 定",
+    },
+    cancelBtnText: {
+      type: String,
+      default: "取消",
+    },
   },
   setup(props) {
     const curdFormRef = ref()
@@ -109,12 +122,14 @@ export default defineComponent({
     }
     const onCancel = () => {
       state.visible = false
+      props.handleClose && props.handleClose("cancel")
       setTimeout(() => {
         props.remove && props.remove()
       }, 300)
     }
     const onBeforeClose = () => {
       state.visible = false
+      props.handleClose && props.handleClose("close")
       setTimeout(() => {
         props.remove && props.remove()
       }, 300)

package/components/FormDialog/src/types.ts

@@ -9,7 +9,10 @@ export interface FormDialogOptions extends Partial<DialogProps> {
   stepSchema?: { name: string; description?: string; formSchema: FormSchema }[]
   formSchema?: FormSchema
   handleOk?: (modelRef: Fields) => Promise<void>
+  handleClose?: (e: "close" | "cancel") => void
   setForm?: (form: Fields) => void
   stepProps?: Partial<StepProps & Fields>
   extendContext?: FormContext
+  confirmBtnText?: string
+  cancelBtnText?: string
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easybill-ui",
-  "version": "1.0.26",
+  "version": "1.0.29",
   "description": "A component library for easybill",
   "author": "tuchongyang <779311998@qq.com>",
   "private": false,
@@ -14,5 +14,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6c4c6612c4b20a3e5819ef61f2f5624c48f50730"
+  "gitHead": "3e72af4edab56358ce12553bc965ced92e596706"
 }