easybill-ui 0.1.8 → 0.1.10

package/components/CurdForm/src/CurdForm.vue

@@ -54,6 +54,10 @@ export default defineComponent({
       type: Object as PropType<Fields>,
       default: undefined,
     },
+    extendContext: {
+      type: Object as PropType<Record<string, any>>,
+      default: undefined,
+    },
   },
   emits: ["update:modelValue", "change"],
   setup(props, { emit, attrs }) {
@@ -78,7 +82,6 @@ export default defineComponent({
       },
       { deep: true }
     )
-
     // 先从schema中读取默认值
     const schemaValues = sFormSchema.value.formItem.reduce<Fields>((previousValue, currentValue) => {
       currentValue.eventObject ??= {}
@@ -183,7 +186,7 @@ export default defineComponent({
     curdFormContext.change = onChange
     curdFormContext.formModel = formModel
     curdFormContext.formRef = schemaFormRef
-
+    props.extendContext && Object.assign(curdFormContext, props.extendContext)
     provide("curdFormContext", curdFormContext)
     return {
       formModel,

package/components/CurdForm/src/types.ts

@@ -41,6 +41,7 @@ export interface FormContext {
   change: (formModel: Fields, formItem: FormItem) => void
   formModel: Fields
   formRef: Ref<InstanceType<typeof ElForm> | undefined>
+  setValue: (prop: string, value?: any) => void
 }
 export interface Fields {
   [key: string]: any

package/components/CurdTable/src/CurdTable.vue

@@ -106,7 +106,7 @@ export default {
 }
 </script>
 <script lang="ts" setup>
-import { computed, ref, reactive, watch, onActivated, getCurrentInstance, provide, PropType, Ref } from "vue"
+import { computed, ref, reactive, watch, onActivated, onMounted, getCurrentInstance, provide, PropType, Ref } from "vue"
 import STableItem from "./STableItem.vue"
 import STableFilter from "./STableFilter.vue"
 import STableMenu from "./STableMenu.vue"
@@ -299,7 +299,10 @@ onActivated(() => {
     hasInit = true
   }
 })
-option.autoload && fetchData()
+// filter内部有一些初始化的操作，比如操作value初始值，需要等子组件初始化后再执行列表数据fetch操作
+onMounted(() => {
+  option.autoload && fetchData()
+})
 // 组装columns
 const { columns, selectParams } = useColumnHook(props)
 // 菜单点击事件

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

@@ -10,6 +10,7 @@ import { ref, watch, Ref, PropType } from "vue"
 import CurdForm from "../../../CurdForm"
 import { ParamsItem, ListQuery } from "../../types"
 import { Fields, FormSchema, FormItem } from "../../../CurdForm"
+import { deepClone } from "../../../CurdForm/src/utils/common"
 const props = defineProps({
   selectParams: {
     type: Array as PropType<Array<ParamsItem>>,
@@ -40,9 +41,10 @@ const formSchema: Ref<FormSchema> = ref({
   formItem: [...as, ...formItemRight],
 })
 const init = () => {
+  // const query = deepClone(listQuery.value)
   for (let i in formSchema.value.formItem) {
     const item = formSchema.value.formItem[i] as ParamsItem
-    if (item.tableKey) {
+    if (item.tableKey && props.listQuery[item.tableKey[0]]) {
       listQuery.value[item.prop] = [props.listQuery[item.tableKey[0]], props.listQuery[item.tableKey[1]]]
     }
   }
@@ -54,28 +56,37 @@ const init = () => {
     } else {
       // const cur1 = formSchema.value.formItem.find((a) => a.tableKey && a.tableKey.includes(i))
       // if (cur1 && cur1.tableKey) {
-      //   listQuery.value[i] = [l[cur1.tableKey[0]], l[cur1.tableKey[1]]]
+      //   query[i] = [l[cur1.tableKey[0]], l[cur1.tableKey[1]]]
       // }
     }
   }
+  // listQuery.value = query
 }
 init()
+
 const emit = defineEmits(["change"])
 watch(
   () => listQuery.value,
   (val) => {
     const l = props.listQuery
     for (let i in val) {
-      l[i] = val[i]
+      const cur = formSchema.value.formItem.find((a) => a.prop == i)
+      if (cur && cur.tableKey) {
+        l[cur.tableKey[0]] = (val[i] && val[i][0]) || ""
+        l[cur.tableKey[1]] = (val[i] && val[i][1]) || ""
+      } else {
+        l[i] = val[i]
+      }
     }
+    //
   },
-  { deep: true }
+  { immediate: true, deep: true }
 )
 const onChange = (formModel: Fields, formItem: any) => {
   const l = props.listQuery
-  if (formItem.tableKey && formModel[formItem.prop] && formModel[formItem.prop].length) {
-    l[formItem.tableKey[0]] = formModel[formItem.prop][0]
-    l[formItem.tableKey[1]] = formModel[formItem.prop][1]
+  if (formItem.tableKey) {
+    l[formItem.tableKey[0]] = formModel[formItem.prop]?.length ? formModel[formItem.prop][0] : ""
+    l[formItem.tableKey[1]] = formModel[formItem.prop]?.length ? formModel[formItem.prop][1] : ""
   }
   if (!formItem.tableKey) {
     l[formItem.prop] = formModel[formItem.prop]

package/components/TableFilter/src/components/FilterTags.vue

@@ -20,8 +20,9 @@
           </div>
         </el-popover>
       </div>
+      <div class="tag-clear"><el-button type="primary" link @click="clear">清空</el-button></div>
     </div>
-    <div class="tag-clear"><el-button type="primary" link @click="clear">清空</el-button></div>
+
     <slot></slot>
   </div>
 </template>

package/components/TableFilter/types.ts

@@ -10,6 +10,7 @@ export interface ParamsItem extends FormItem {
 export interface TableFilterContext {
   loadOptions: (prop: string) => void
   setValue: (prop: string, value: any) => void
+  search: () => void
 }
 export interface ListQuery {
   [key: string]: any //string | boolean | number | Array<string> | Array<number>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easybill-ui",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "A component library for easybill",
   "author": "tuchongyang <779311998@qq.com>",
   "private": false,
@@ -14,5 +14,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "79b05c37c0ba99d06e25dfeee34cbb0722dd5c1a"
+  "gitHead": "2733f8f19e6fa098d2dd73b572a94e75b5ef81a7"
 }