bl-common-vue3 3.8.78 → 3.8.80

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bl-common-vue3",
3
- "version": "3.8.78",
3
+ "version": "3.8.80",
4
4
  "main": "index.js",
5
5
  "module": "index.js",
6
6
  "description": "bailing vue3 common components lib",
@@ -174,7 +174,7 @@ export default defineComponent({
174
174
  {
175
175
  nation_code: phoneCountry.toString(),
176
176
  nation_name: '',
177
- phone_match_rule: '^\d+$', // 默认为仅数字的正则。
177
+ phone_match_rule: '^\\d+$', // 默认为仅数字的正则。
178
178
  id: -1
179
179
  }
180
180
  ]
@@ -193,7 +193,9 @@ export default defineComponent({
193
193
  },
194
194
  success: (res) => {
195
195
  state.phoneCountryList = res.list || [];
196
- handleNotInPhoneCountryList(props?.data?.phone_country)
196
+ formState.value.phone_country = props?.data?.phone_country && props?.data?.phone_country != '0' ? props?.data?.phone_country.toString() : undefined;
197
+ formState.value.phone = props?.data?.phone || "";
198
+ handleNotInPhoneCountryList(props?.data?.phone_country)
197
199
  phoneCountryHandleInit()
198
200
  },
199
201
  fail: () => {},
@@ -202,18 +204,23 @@ export default defineComponent({
202
204
 
203
205
  getPhoneCountryList();
204
206
 
205
- watch(
206
- () => props.data,
207
- (val) => {
208
- handleNotInPhoneCountryList(val?.phone_country)
207
+ const dataStr = computed(() => {
208
+ return JSON.stringify(props.data)
209
+ })
209
210
 
210
- if ((val.phone_country || val.phone) && (formState.value.phone_country !== val.phone_country || formState.value.phone !== val.phone)) {
211
- formState.value.phone_country = val && val.phone_country && val.phone_country != '0' ? val.phone_country.toString() : undefined;
212
- formState.value.phone = val.phone || "";
213
- phoneCountryHandleInit()
214
- }
211
+ watch(
212
+ () => dataStr.value,
213
+ (newVal, oldVal) => {
214
+ if(newVal && newVal != oldVal) {
215
+ const val = props.data
216
+ if ((val.phone_country || val.phone) && (formState.value.phone_country !== val.phone_country || formState.value.phone !== val.phone)) {
217
+ formState.value.phone_country = val && val.phone_country && val.phone_country != '0' ? val.phone_country.toString() : undefined;
218
+ formState.value.phone = val.phone || "";
219
+ handleNotInPhoneCountryList(formState.value.phone_country)
220
+ phoneCountryHandleInit()
221
+ }
222
+ }
215
223
  },
216
- { deep: true, immediate: true }
217
224
  );
218
225
 
219
226
  // 获取手机号校验结果
@@ -793,10 +793,12 @@
793
793
  v-if="ApprovalProcessSettings && approvalList.length > 0"
794
794
  key="Approval_process"
795
795
  @click.stop="handleApprovalProcess">
796
- <span style="display: inline-block; padding-left: 15px">
797
- <bl-icon type="shenpiliucheng" />
796
+ <a-button type="text">
797
+ <template #icon>
798
+ <bl-icon type="shenpiliucheng" />
799
+ </template>
798
800
  {{ t("CustomTable.index.909124-0") }}
799
- </span>
801
+ </a-button>
800
802
  </a-menu-item>
801
803
 
802
804
  <a-menu-item