@bsgoal/common 2.11.1 → 2.11.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsgoal/common",
-  "version": "2.11.1",
+  "version": "2.11.3",
   "private": false,
   "files": [
     "dist",

package/src/components/bsgoal-base-search/demo.vue

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-13 09:38:19
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-04-27 17:44:25
+ * @LastEditTime: 2023-06-21 14:23:18
  * @FilePath: \common\src\components\bsgoal-base-search\demo.vue
  * @Description: 表格查询组件演示
  * 
@@ -24,7 +24,7 @@ const searchModelValue = ref({})
 let curLocalOptions = ref([
   {
     label: 'prop1',
-    // value: '111',
+    value: '111',
     prop: 'prop1',
     type: ComponentTypeEnums.INPUT
   },
@@ -54,7 +54,7 @@ let curLocalOptions = ref([
   },
   {
     label: 'prop3',
-    // value: '111',
+    value: '111',
     type: ComponentTypeEnums.SLIDER,
     prop: 'prop3'
   },

package/src/components/bsgoal-base-search/index.vue

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-13 09:38:11
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-06-20 19:03:02
+ * @LastEditTime: 2023-06-21 14:35:58
  * @FilePath: \common\src\components\bsgoal-base-search\index.vue
  * @Description: 表格查询 公共组件
  * 
@@ -17,7 +17,6 @@ import baseDirective from '../../directives/directiveBase.js'
 import BsgoalBaseLine from '../bsgoal-base-line/index.vue'
 import BsgoalBaseSearchOperation from '../bsgoal-base-search-operation/index.vue'
 import BsgoalBaseCascader from '../bsgoal-base-cascader/index.vue'
-
 defineOptions({
   name: 'BsgoalBaseSearch'
 })
@@ -72,7 +71,7 @@ const EL_FORM_REF = ref(null)
 const vAlign = baseDirective.align
 
 const model = ref({})
-const watchPropList = []
+// const watchPropList = []
 
 /**
  * @Author: canlong.shen
@@ -85,11 +84,8 @@ watchEffect(() => {
   const { configOptions } = props
   const options = unref(configOptions)
   options.forEach((fei) => {
-    const { value, prop = '', type = '' } = fei
-    if (![ComponentTypeEnums.INPUT, ComponentTypeEnums.INPUT_TEXT_AREA].includes(type)) {
-      watchPropList.push(prop)
-    }
-    model.value[prop] = [0, false].includes(value) ? value : ''
+    const { value, prop = '' } = fei
+    model.value[prop] = value || [0, false].includes(value) ? value : ''
   })
 })
 
@@ -210,7 +206,12 @@ const triggerOperationSearch = () => {
       shadowModel[prop] = value
     }
 
-    if (type.endsWith('range') && range && range.length === 2) {
+    if (
+      Array.isArray(value) &&
+      Array.isArray(range) &&
+      type.endsWith('range') &&
+      range.length === 2
+    ) {
       const { 0: startValue = '', 1: endValue = '' } = value
       const { 0: startProp = '', 1: endProp = '' } = range
       shadowModel[startProp] = startValue
@@ -271,7 +272,6 @@ const triggerValueChange = (type, prop) => {
   emits('on-change', emitValue)
 }
 
-
 // ---> S 暴露 <---
 defineExpose({
   triggerOperationSearch

package/src/components/bsgoal-base-search-table/demo.vue

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-18 17:04:53
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-06-21 10:22:10
+ * @LastEditTime: 2023-06-21 14:26:18
  * @FilePath: \common\src\components\bsgoal-base-search-table\demo.vue
  * @Description: 查询 + 表格 组合公共组件
  * 
@@ -25,7 +25,7 @@ const props = defineProps({})
 const configOptions = ref([
   {
     label: 'prop1',
-    // value: '111',
+     value: '111',
     prop: 'prop1',
     type: ComponentTypeEnums.INPUT,
     width: '100px'

package/src/utils/common.js

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-05-08 15:11:05
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-05-08 15:11:11
+ * @LastEditTime: 2023-06-21 14:07:09
  * @FilePath: \common\src\utils\common.js
  * @Description: 常用的工具方法
  * 
@@ -51,3 +51,6 @@ export const isBoolean = (tar) => {
 export const isUndefind = (tar) => {
   return getInstanceType(tar) === 'undefind'
 }
+export const isArray = (tar) => {
+  return Array.isArray(tar)
+};

package/src/components/bsgoal-base-dialog/debug.log

@@ -1,8 +0,0 @@
-[0531/113627.873:ERROR:registration_protocol_win.cc(107)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)
-[0531/113628.535:ERROR:registration_protocol_win.cc(107)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)
-[0531/114349.870:ERROR:registration_protocol_win.cc(107)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)
-[0531/134940.513:ERROR:registration_protocol_win.cc(107)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)
-[0531/134940.513:ERROR:registration_protocol_win.cc(107)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)
-[0531/140033.847:ERROR:registration_protocol_win.cc(107)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)
-[0531/140033.869:ERROR:registration_protocol_win.cc(107)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)
-[0531/143430.040:ERROR:registration_protocol_win.cc(107)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)