w-ui-v1 1.1.45 → 1.1.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "w-ui-v1",
-  "version": "1.1.45",
+  "version": "1.1.47",
   "description": "w-ui",
   "author": "wgxshh",
   "license": "ISC",

package/w-form-control/w-form-control.vue

@@ -280,13 +280,8 @@ const displayText = computed(() => {
   }
   // datetime
   if (props.subItem.controlType === 'datetime' || props.subItem.extControlType === 'datetime') {
-    if (Array.isArray(val) && val.length === 2) {
-      const fmt = props.subItem.extControlType === 'datetimerange' ? 'YYYY-MM-DD HH:mm' : 'YYYY-MM-DD'
-      const v0 = dayjs(val[0])
-      const v1 = dayjs(val[1])
-      if (v0.isValid() && v1.isValid()) return `${v0.format(fmt)} ~ ${v1.format(fmt)}`
-    }
-    if (typeof val === 'string' && val.includes('~')) return val
+    if (typeof val === 'string') return dayjs(val).isValid() ? dayjs(val).format('YYYY-MM-DD HH:mm') : val
+    if (typeof val === 'number') return dayjs(val).isValid() ? dayjs(val).format('YYYY-MM-DD HH:mm') : ''
     return ''
   }
   // select 枚举 - 查找 label
@@ -398,9 +393,12 @@ const displayFormat2 = (value: any) => {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  text-align: right;
+  text-align: left;
 }
 :deep(.form-control-item .form-select-clear) {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
   flex-shrink: 0;
   margin-left: 4px;
   padding: 4px;

package/w-search/w-search.vue

@@ -44,7 +44,7 @@
 						<view class="search-btn">
 							<wd-button size="small" icon="refresh" :round="false" @click="clear"
 								type="info">{{changeLanguageConmon('重置')}}</wd-button>
-							<wd-button size="small" icon="search" :round="false"
+							<wd-button size="small" icon="search-line" :round="false"
 								@click="search">{{changeLanguageConmon('确定')}}</wd-button>
 
 						</view>

package/w-select-picker/w-select-picker.vue

@@ -254,7 +254,15 @@
 	// 获取页面配置
 	function getPageConfig() {
 		pageConfig(props.sourceId).then((res : any) => {
-			ltmplConfig.value = res.data.ltmplConfig
+			// 字段名映射：API返回criterias/primaryCriteria等，统一转为新命名
+			const cfg = res.data.ltmplConfig
+			ltmplConfig.value = {
+			  ...cfg,
+			  criteria: cfg.criterias || cfg.criteria || [],
+			  primaryCriterion: cfg.primaryCriterion || cfg.primaryCriteria || {},
+			  secondCriterion: cfg.secondCriterion || cfg.secondCriteria || {},
+			  thirdCriterion: cfg.thirdCriterion || cfg.thirdCriteria || {},
+			}
 			scrolltolower()
 		})
 	}

package/w-table/w-table.vue

@@ -89,8 +89,18 @@ watch(() => props.sourceId, (value) => {
 // 获取页面配置
  function getPageConfig() {
   pageConfig(sourceId.value).then(async(res: any) => {
-    pageData.value = res.data.ltmplConfig
-    console.log(pageData.value,'322222')
+	// 字段名映射：API返回criterias/primaryCriteria，组件使用criteria/primaryCriterion
+        const cfg = res.data.ltmplConfig
+        pageData.value = {
+          criteria: cfg.criterias || cfg.criteria || [],
+          buttons: cfg.buttons || [],
+          primaryCriterion: cfg.primaryCriterion || cfg.primaryCriteria || {},
+          defaultCriteriaValue: cfg.defaultCriteriaValue || {},
+          secondCriterion: cfg.secondCriterion || cfg.secondCriteria || {},
+          thirdCriterion: cfg.thirdCriterion || cfg.thirdCriteria || {},
+          ...cfg
+        }
+	    console.log(pageData.value,'322222')
 	//获取枚举
 	Enumcolumn.value=await getEnumer(pageData.value)
   })
@@ -167,7 +177,7 @@ defineExpose({
 		<view v-if="props.showSearch">
 			<view >
 			  <!-- 搜索 -->
-			  <wSearch :primaryCriterion="pageData.primaryCriteria" :criteria="pageData.criterias" @search="search" v-if="pageData.buttons.includes('query')">
+			  <wSearch :primaryCriterion="pageData.primaryCriterion" :criteria="pageData.criteria" @search="search" v-if="pageData.buttons.includes('query')">
 			  </wSearch>
 			  
 			</view>