@bsgoal/common 2.15.16 → 2.15.18

package/package.json

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

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-23 16:35:24
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-06-30 09:17:44
+ * @LastEditTime: 2023-07-01 09:17:22
  * @FilePath: \common\src\components\bsgoal-base-dialog\demo.vue
  * @Description: 弹窗公共组件 演示
  * 
@@ -14,7 +14,7 @@
 import { ref } from 'vue'
 import BsgoalBaseDialog from './index.vue'
 import BsgoalBaseTabs from '../bsgoal-base-tabs/index.vue'
-
+import BsgoalBaseForm from '../bsgoal-base-form/index.vue'
 defineOptions({
   name: 'BsgoalBaseDialogDemo'
 })
@@ -23,6 +23,7 @@ const props = defineProps({})
 
 const dialogVisible = ref(false)
 const dialogVisible2 = ref(false)
+const dialogVisible3 = ref(false)
 
 const test = () => {
   dialogVisible.value = true
@@ -30,6 +31,9 @@ const test = () => {
 const test2 = () => {
   dialogVisible2.value = true
 }
+const test3 = () => {
+  dialogVisible3.value = true
+}
 
 const activeTabName = ref('tab1')
 const tabsConfigOptions = ref([
@@ -64,6 +68,231 @@ const triggerShow = (status = '') => {
 const triggerHide = (status = '') => {
   console.log(status, '关闭')
 }
+
+const bindModel = ref({ prop1: '111', prop99: 1, prop101: '否', prop102: '0', _prop104: '' })
+
+import ComponentTypeEnums from '../../enums/componentTypeEnums.js'
+
+// 配置项
+const configOptions = ref([
+  // { label: '名称', prop: 'residentialName', limit: 5, readonly: true }
+
+  {
+    label: 'prop104',
+    prop: '_prop104',
+    validator: true,
+    rules: [
+      {
+        validator: (rule, value, callback) => {
+          console.log('value', value)
+
+          //  return callback(new Error('Please input the age'))
+          return callback()
+        },
+        trigger: 'change'
+      }
+    ]
+  },
+  {
+    label: 'prop103',
+    prop: 'prop103',
+    type: ComponentTypeEnums.INPUT,
+    formatter: (value = '') => {
+      return `${value}`.match(/^\d{1,}$/) ? value : ''
+    },
+    placeholder: '',
+    rules: true
+  },
+
+  {
+    label: '11',
+    prop: 'prop101',
+    type: ComponentTypeEnums.CHECKBOX_SINGLE,
+    show: { prop102: ['1'] },
+    range: [
+      {
+        value: '是'
+      },
+      {
+        value: '否'
+      }
+    ]
+  },
+  {
+    type: ComponentTypeEnums.SWITCH,
+    label: 'prop102',
+    prop: 'prop102',
+    range: [
+      { label: '是', value: '1' },
+      { label: '否', value: '0' }
+    ]
+  },
+  {
+    label: 'prop100',
+    prop: 'prop100',
+    rows: 4,
+    length: 1000,
+    type: ComponentTypeEnums.INPUT_TEXT_AREA
+  },
+  {
+    label: 'prop99',
+    prop: 'prop99',
+    value: 0,
+    type: ComponentTypeEnums.INPUT_NUMBER,
+    max: 'max'
+  },
+  {
+    label: 'prop1',
+    // value: '111',
+    prop: 'prop1',
+    type: ComponentTypeEnums.INPUT,
+    width: '100px',
+    rules: [],
+    readonly: true
+  },
+  {
+    label: 'prop20',
+    // value: '111',
+    prop: 'prop20',
+    type: ComponentTypeEnums.INPUT,
+    width: '100px',
+    rules: [],
+    readonly: true
+  },
+  {
+    label: 'prop2',
+    value: [],
+    type: ComponentTypeEnums.SELECT,
+    prop: 'prop2',
+    multiple: true,
+    range: [
+      {
+        label: 'select1',
+        value: 'select1'
+      },
+      {
+        label: 'select2',
+        value: 'select2'
+      },
+      {
+        label: 'select3',
+        value: 'select3'
+      },
+      {
+        label: 'select4',
+        value: 'select5'
+      }
+    ]
+  },
+  {
+    label: 'prop3',
+    // value: '111',
+    type: ComponentTypeEnums.SLIDER,
+    prop: 'prop3'
+  },
+  {
+    label: 'prop4',
+    // value: '111',
+    type: ComponentTypeEnums.SWITCH,
+    prop: 'prop4',
+    range: [
+      { label: '是', value: 1 },
+      { label: '否', value: 0 }
+    ]
+  },
+  {
+    label: 'prop5',
+    // value: '111',
+    type: ComponentTypeEnums.RADIO,
+    prop: 'prop5',
+    range: [
+      {
+        label: 'radio1',
+        value: 'radio1'
+      },
+      {
+        label: 'radio2',
+        value: 'radio2'
+      }
+    ]
+  },
+  {
+    label: 'prop6',
+    value: [],
+    type: ComponentTypeEnums.CHECKBOX,
+    prop: 'prop6',
+    range: [
+      {
+        label: 'checkbox1',
+        value: 'checkbox1'
+      },
+      {
+        label: 'checkbox2',
+        value: 'checkbox2'
+      }
+    ]
+  },
+  {
+    label: 'prop7',
+    // value: '111',
+    type: ComponentTypeEnums.DATE,
+    prop: 'prop7',
+    format: 'YYYY-MM-DD'
+  },
+  {
+    label: 'prop9',
+    // value: '111',
+    type: ComponentTypeEnums.MONTH,
+    prop: 'prop9'
+  },
+  {
+    label: 'prop10',
+    // value: '111',
+    type: ComponentTypeEnums.YEAR,
+    prop: 'prop10'
+  },
+  {
+    label: 'prop11',
+    // value: '111',
+    type: ComponentTypeEnums.DATE_RANGE,
+    prop: 'prop11',
+    range: ['startDate', 'endDate']
+  },
+  {
+    label: 'prop12',
+    // value: '111',
+    type: ComponentTypeEnums.MONTH_RANGE,
+    prop: 'prop12'
+  },
+  {
+    label: 'prop13',
+    // value: '111',
+    type: ComponentTypeEnums.TIME,
+    prop: 'prop13'
+  },
+  {
+    label: 'prop14',
+    // value: '111',
+    type: ComponentTypeEnums.TIME_RANGE,
+    prop: 'prop14'
+  },
+  {
+    label: 'prop15',
+    // value: '111',
+    type: ComponentTypeEnums.DATE_TIME,
+    prop: 'prop15'
+  },
+  {
+    label: 'prop16',
+    // value: '111',
+    type: ComponentTypeEnums.DATE_TIME_RANGE,
+    prop: 'prop16'
+  }
+])
+
+const values = ref({
+  residentialName: '1111'
+})
 </script>
 <template>
   <div class="bsgoal-base-dialog-demo">
@@ -84,8 +313,30 @@ const triggerHide = (status = '') => {
       >
         <BsgoalBaseTabs v-memo="activeTabName" :config-options="tabsConfigOptions" />
       </BsgoalBaseDialog>
+      <BsgoalBaseDialog
+        v-model="dialogVisible3"
+        size="medium"
+        type="blank"
+        @on-confirm="triggerConfirm"
+        @on-show="triggerShow"
+        @on-hide="triggerHide"
+      >
+        <div class="bsgoal-base-form-demo">
+          <BsgoalBaseForm
+            ref="BSGOAL_BASE_FORM_REF"
+            readonly
+            none="--"
+            :limits="10"
+            :config-options="configOptions"
+            :bind-model="values"
+          >
+            <template #_prop104> 6666 </template>
+          </BsgoalBaseForm>
+        </div>
+      </BsgoalBaseDialog>
       <el-button type="primary" @click="test">打开弹窗</el-button>
       <el-button type="primary" @click="test2">打开弹窗2</el-button>
+      <el-button type="primary" @click="test3">打开弹窗3</el-button>
     </div>
   </div>
 </template>

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-23 16:35:19
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-06-30 09:13:34
+ * @LastEditTime: 2023-07-01 09:08:25
  * @FilePath: \common\src\components\bsgoal-base-dialog\index.vue
  * @Description:  弹窗公共组件
  * 
@@ -75,10 +75,17 @@ const props = defineProps({
   footer: {
     type: [Boolean],
     default: true
+  },
+  /**
+   * 是否重新渲染整个视图
+   */
+  isRefresh: {
+    type: [Boolean],
+    default: true
   }
 })
 
-const emits = defineEmits(['update:modelValue', 'on-confirm','on-show','on-hide'])
+const emits = defineEmits(['update:modelValue', 'on-confirm', 'on-show', 'on-hide'])
 const dialogVisible = ref(props.modelValue.value)
 
 /**
@@ -168,7 +175,7 @@ const widthGet = computed(() => {
             }
           ]"
         >
-          <slot></slot>
+          <slot v-if="dialogVisible && isRefresh"></slot>
         </div>
         <template #footer>
           <slot name="footer" v-if="footer">

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 17:32:31
+ * @LastEditTime: 2023-06-30 19:44:43
  * @FilePath: \common\src\components\bsgoal-base-form\index.vue
  * @Description:  表单公共组件 
  * 
@@ -355,7 +355,7 @@ const filterSlotProps = (model = {}) => {
   for (const prop of Object.keys(model)) {
     if (!prop.startsWith('_')) {
       const value = model[prop]
-      const valueInt = Number.parseInt(value)
+      const valueInt = Number.parseFloat(value)
       rebuildModel[prop] = ( valueInt || ['0', 0].includes(value) ) && !(/^0.+/i).test(`${value}`) ? valueInt : value
     }
   }

package/src/directives/directiveBase.js

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-14 10:50:11
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-05-22 15:55:30
+ * @LastEditTime: 2023-07-01 09:22:49
  * @FilePath: \common\src\directives\directiveBase.js
  * @Description: 常用的公共指令
  *
@@ -76,7 +76,9 @@ export default {
       })
     },
     mounted(el) {
+      setTimeout(() => {
       autoAlign(el)
+      }, 100);
     },
     unmounted(el) {
       window.removeEventListener('resize', autoAlign(el))