@bsgoal/common 2.15.9 → 2.15.11

package/package.json

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

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-10 15:00:00
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-06-30 08:59:19
+ * @LastEditTime: 2023-06-30 14:21:51
  * @FilePath: \common\src\components\bsgoal-base-form\demo.vue
  * @Description: 表单公共组件演示组件
  * 
@@ -20,9 +20,7 @@ defineOptions({
 })
 
 const values = ref({
-  prop1: '222',
-  prop2: 'select1',
-  prop20: ''
+  residentialName: '1111'
 })
 
 const BSGOAL_BASE_FORM_REF = ref(null)
@@ -40,6 +38,8 @@ const bindModel = ref({ prop1: '111', prop99: 1, prop101: '否', prop102: '0', _
 
 // 配置项
 const configOptions = ref([
+  // { label: '名称', prop: 'residentialName', limit: 5, readonly: true }
+
   {
     label: 'prop104',
     prop: '_prop104',
@@ -252,10 +252,16 @@ const configOptions = ref([
     prop: 'prop16'
   }
 ])
+
+const changeValues = (params = '') => {
+  values.value = {
+    residentialName: '2222'
+  }
+}
 </script>
 <template>
   <div class="bsgoal-base-form-demo">
-    {{ bindModel }}
+    {{ values }}
     <BsgoalBaseForm
       ref="BSGOAL_BASE_FORM_REF"
       readonly
@@ -263,12 +269,13 @@ const configOptions = ref([
       :itemStyler="{ marginBottom: '8px' }"
       :limits="10"
       :config-options="configOptions"
-      :bind-model="bindModel"
+      :bind-model="values"
     >
       <template #_prop104> 6666 </template>
     </BsgoalBaseForm>
     <el-button type="primary" @click="confirm">提交</el-button>
     <el-button type="primary" @click="resetFields">重置</el-button>
+    <el-button type="primary" @click="changeValues">改变值</el-button>
   </div>
 </template>
 <style lang="scss" scoped>

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-17 11:44:29
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-06-30 09:19:56
+ * @LastEditTime: 2023-06-30 14:20:25
  * @FilePath: \common\src\components\bsgoal-base-form\index.vue
  * @Description:  表单公共组件 
  * 
@@ -122,10 +122,16 @@ const EL_FORM_REF = ref(null)
 // 自定义指令
 const vAlign = baseDirective.align
 
-const model = ref(props.bindModel)
+const model = ref()
 const watchPropList = []
 
 // ---> S 初始值 <---
+
+watchEffect(() => {
+  const { bindModel = {} } = props
+  model.value = bindModel
+})
+
 /**
  * @Author: canlong.shen
  * @description:
@@ -166,10 +172,16 @@ watchEffect(() => {
     if (![ComponentTypeEnums.INPUT, ComponentTypeEnums.INPUT_TEXT_AREA].includes(type)) {
       watchPropList.push(prop)
     }
-    const bindValue = unref(model)[prop]
+    const bindValue = model.value[prop]
     if (prop.startsWith('_')) {
       model.value[prop] = `${prop}`
     } else {
+      console.log('bindValue', bindValue)
+      console.log('valuesModel[prop]', valuesModel[prop])
+      console.log(
+        'bindValue || valuesModel[prop] || value',
+        bindValue || valuesModel[prop] || value
+      )
       model.value[prop] = bindValue || valuesModel[prop] || value
     }
 
@@ -341,8 +353,8 @@ const filterSlotProps = (model = {}) => {
   for (const prop of Object.keys(model)) {
     if (!prop.startsWith('_')) {
       const value = model[prop]
-      const valueInt = Number.parseInt(value);
-      rebuildModel[prop] = valueInt || ['0', 0].includes(value) ? valueInt : value;
+      const valueInt = Number.parseInt(value)
+      rebuildModel[prop] = valueInt || ['0', 0].includes(value) ? valueInt : value
     }
   }
   return rebuildModel
@@ -409,7 +421,7 @@ defineExpose({
   triggerOperationClear,
   triggerOperationForm,
   validateForm,
-  resetFields:triggerOperationClear
+  resetFields: triggerOperationClear
 })
 </script>
 <template>

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-10 11:29:04
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-06-30 09:56:18
+ * @LastEditTime: 2023-06-30 10:33:45
  * @FilePath: \common\src\components\bsgoal-base-table\index.vue
  * @Description: 
  * 
@@ -298,10 +298,7 @@ const summaryMethod = (columns = '') => {
     })
     calcResultList[index] = sum
   })
-
-  console.log('calcResultList',calcResultList);
-
-  return ['合计', ...calcResultList.slice(1)]
+  return ['合计', ...calcResultList]
 }
 
 // ---> E 表格绑定的方法 <---