easybill-ui 1.0.23 → 1.0.25

package/components/ConstantStatus/src/ConstantStatus.vue

@@ -1,13 +1,12 @@
 <template>
-  <el-tag v-if="current" class="constant-status" :class="{ 'dot-status': current.dot }" v-bind="currentProps">
+  <div class="el-tag constant-status" :class="tagClass" v-bind="currentProps">
     <el-icon v-if="(current.icon || current.iconClass) && !current.dot" :class="current.iconClass" style="margin-right: 5px">
       <component :is="current.icon" v-if="current.icon" class="icon" :size="14" style="width: 12px; height: 12px" />
     </el-icon>
     <span v-if="current.dot" class="dot"></span>
     <span v-if="current.html" class="name" v-html="current.label"></span>
     <span v-else class="name">{{ current.label }}</span>
-  </el-tag>
-  <span v-else>{{ typeof value === "undefined" || value === "" ? "--" : value }}</span>
+  </div>
 </template>
 <script lang="ts">
 export default {
@@ -37,27 +36,33 @@ const current = computed(() => {
       label: curs.map((a) => a.label).join(","),
     }
   }
-  if (value === "" || value === undefined) {
-    return undefined
-  }
-  return result && result.find((a) => a.value == props.value)
+  return (result && result.find((a) => a.value == props.value)) || {}
 })
 const currentProps = computed(() => {
-  const defaults = { type: "", label: "", value: "", class: [""], style: {} } as OptionItem
+  const defaults = { type: "", label: "", value: "", style: {} } as OptionItem
   const result = props.options || []
   const cur = result.find((a) => a.value == props.value)
   if (!cur) return {}
   const { label, value, border, type, ...args } = cur
   if (typeof border !== "undefined") {
-    defaults.class = ["no-border"]
     defaults.style = args.color ? { color: args.color, backgroundColor: "transparent" } : {}
   }
-  // 判断type在不在里面
-  if (type && ["success", "info", "warning", "danger"].includes(String(type))) {
-    defaults.type = type
-  } else {
-    defaults.class.push("el-tag--" + (type || "default"))
-  }
   return { ...defaults, ...args }
 })
+const tagClass = computed(() => {
+  const result = [current.value?.dot ? "dot-status" : "", "el-tag--" + (current.value?.type || "default"), "el-tag--" + (current.value?.effect || "light")]
+  if (current.value?.size) {
+    result.push("el-tag--" + current.value?.size)
+  }
+  if (current.value?.hit) {
+    result.push("is-hit")
+  }
+  if (current.value?.round) {
+    result.push("is-round")
+  }
+  if (typeof current.value?.border !== "undefined") {
+    result.push("no-border")
+  }
+  return result
+})
 </script>

package/components/TableFilter/src/FilterExternal/FilterExternal.vue

@@ -1,5 +1,5 @@
 <template>
-  <CurdForm ref="formRef" v-model="query" inline class="filter-external" :form-schema="formSchema" v-bind="option?.formProps" @change="onChange">
+  <CurdForm ref="formRef" v-model="query" inline class="filter-external" :form-schema="formSchema" v-bind="option?.formProps" :extend-context="props.extendContext" @change="onChange">
     <template #defaultFilter>
       <slot></slot>
     </template>
@@ -27,6 +27,10 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  extendContext: {
+    type: Object,
+    default: () => ({}),
+  },
 })
 const option = inject<FilterOption>("option")
 const query = ref<any>({})
@@ -100,5 +104,6 @@ const formRef = ref()
 const loadOptions = (prop: string, option?: any) => {
   return formRef.value.loadOptions(prop, option)
 }
+
 defineExpose({ loadOptions })
 </script>

package/components/TableFilter/src/TableFilter.vue

@@ -2,7 +2,7 @@
   <div class="table-filter">
     <slot name="top"></slot>
     <div>
-      <FilterExternal ref="filterExternalRef" :select-params="selectParams" :list-query="listQuery" :has-slot="selectParams.some((a) => !a.external)" v-bind="$attrs" @change="onChange">
+      <FilterExternal ref="filterExternalRef" :select-params="selectParams" :list-query="listQuery" :has-slot="selectParams.some((a) => !a.external)" :extendContext="extendContext" v-bind="$attrs" @change="onChange">
         <template #default>
           <FilterSearchBox v-if="selectParams.some((a) => !a.external)" ref="searchRef" :select-params="selectParams.filter((a) => !a.external)" :select-list="selectList" :list-query="listQuery" @search="onChange" />
         </template>
@@ -177,6 +177,9 @@ const loadOptions = (prop: string, option?: any) => {
   }
   return searchRef.value.loadOptions(prop, option)
 }
+const extendContext = {
+  loadOptions: loadOptions,
+}
 const clear = () => {
   for (let i = 0; i < selectList.value.length; i++) {
     delete listQuery[selectList.value[i].prop]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easybill-ui",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "description": "A component library for easybill",
   "author": "tuchongyang <779311998@qq.com>",
   "private": false,
@@ -14,5 +14,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "cb0c6d1119a11d575bde91b87bbf44e7bbd92a80"
+  "gitHead": "028e472c4918af43e28512f928ff9823526afe90"
 }