easybill-ui 1.0.32 → 1.0.34

package/components/CurdForm/src/components/schema-form-select.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-select v-model="model" style="width: 100%" :loading="formItem.loading || loading" :placeholder="'请选择' + formItem.label" v-bind="selectProps" v-on="eventObject">
+  <el-select v-model="model" style="width: 100%" :loading="formItem.loading || loading" :placeholder="'请选择' + formItem.label" v-bind="props" v-on="eventObject">
     <el-option v-if="props.all && !props.multiple" value="" label="全部"></el-option>
     <el-checkbox v-if="props.all && props.multiple" v-model="checked" label="全选" class="schema-form-select-check" />
     <template v-for="option in list" :key="option.value">

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

@@ -34,18 +34,20 @@ const props = defineProps({
 })
 const option = inject<FilterOption>("option")
 const query = ref<any>({})
-// 特殊处理数组
-const formItemLeft = props.selectParams.filter((a) => a.external === true || a.external === "left").sort((a, b) => parseInt(String(b.sortIndex || 0)) - parseInt(String(a.sortIndex || 0))) as FormItem[]
-const formItemRight = props.selectParams.filter((a) => a.external === "right") as FormItem[]
-const as = [...formItemLeft]
-if (props.hasSlot) {
-  as.push({ prop: "defaultFilter", type: "defaultFilter" })
-}
-const formItem: FormItem[] = [...as, ...formItemRight]
+
 const formSchema = ref<FormSchema>({
-  formItem,
+  formItem: [],
 })
 const init = () => {
+  // 特殊处理数组
+  const formItemLeft = props.selectParams.filter((a) => a.external === true || a.external === "left").sort((a, b) => parseInt(String(b.sortIndex || 0)) - parseInt(String(a.sortIndex || 0))) as FormItem[]
+  const formItemRight = props.selectParams.filter((a) => a.external === "right") as FormItem[]
+  const as = [...formItemLeft]
+  if (props.hasSlot) {
+    as.push({ prop: "defaultFilter", type: "defaultFilter" })
+  }
+  const formItem: FormItem[] = [...as, ...formItemRight]
+  formSchema.value.formItem = formItem
   // const query = deepClone(query.value)
   for (let i in formSchema.value.formItem) {
     const item = formSchema.value.formItem[i] as ParamsItem
@@ -68,6 +70,12 @@ const init = () => {
   // query.value = query
 }
 init()
+watch(
+  () => props.selectParams,
+  () => {
+    init()
+  },
+)
 
 const emit = defineEmits(["change"])
 watch(

package/components/TableFilter/src/TableFilter.vue

@@ -16,7 +16,7 @@
 export default { name: "TableFilter" }
 </script>
 <script lang="ts" setup>
-import { PropType, provide, Ref, ref, reactive, onMounted } from "vue"
+import { PropType, provide, Ref, ref, reactive, onMounted, watch } from "vue"
 import * as I from "../types"
 import FilterExternal from "./FilterExternal/FilterExternal.vue"
 import FilterSearchBox from "./FilterSearchBox.vue"
@@ -190,8 +190,8 @@ const clear = () => {
 }
 // 重新调用selectParams
 const refreshSelectParams = () => {
-  if (props.schema) {
-    selectParams.value = deepClone(props.schema)
+  if (props.schema || props.selectParams) {
+    selectParams.value = deepClone(props.schema || props.selectParams)
   }
 }
 const getCurrentIndex = () => {
@@ -209,6 +209,13 @@ const tableFilterContext = reactive<I.TableFilterContext>({
   },
   setValue,
 })
+watch(
+  () => [props.schema, props.selectParams],
+  () => {
+    refreshSelectParams()
+    getTags()
+  },
+)
 provide("tableFilter", tableFilterContext)
 provide("state", state)
 provide("selectList", selectList)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easybill-ui",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "description": "A component library for easybill",
   "author": "tuchongyang <779311998@qq.com>",
   "private": false,
@@ -14,5 +14,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a2085a505ab0946228f2278e64bfef292beb9a54"
+  "gitHead": "a8d171c2ac5f0a16ba1c85aa8114cd05013d3e2d"
 }