w-ui-v1 1.0.48 → 1.0.50

package/package.json

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

package/utils/http.ts

@@ -4,6 +4,7 @@ export default function request(options: any): Promise<any> {
   const hydrocarbonProgramToken = uni.getStorageSync('hydrocarbonProgramToken') || ''
   const token = uni.getStorageSync('token') || ''
   const header = options.header || {}
+  const hydrocarbonClient=uni.getStorageSync('hydrocarbonClient') ||"MOBILE"
   return new Promise((resolve, reject) => {
     uni.request({
       url: baseUrl + options.url,
@@ -13,7 +14,7 @@ export default function request(options: any): Promise<any> {
         'content-type': 'application/x-www-form-urlencoded',
         'hydrocarbon-program-token': hydrocarbonProgramToken, // 项目code
         'hydrocarbon-token': token, // 登录token
-        'hydrocarbon-client': 'MOBILE',
+        'hydrocarbon-client': hydrocarbonClient,//端类型
         // #ifdef APP-PLUS
         'hydrocarbon-app-version': '1.0.0',
         // #endif

package/w-card/w-card.vue

@@ -263,8 +263,8 @@ const getTitleValue = (value: any, title: string) => {
           </view>
         </view>
 
-        <view v-else class="value">
-          {{ item.content?.label ? item.content?.label : item.content }}
+        <view v-else class="value" v-html="item.content?.label ? item.content?.label : item.content">
+          
         </view>
 
       </view>

package/w-detail/w-detail.vue

@@ -167,11 +167,10 @@ function goto(type = '', PItem: any, item: any) {
 									<text> {{ bItem.label }}</text>
 								</view>
 							</view>
-							<view v-else class="value">
-								{{
-									getValue(pageData.fieldMap[subItem.sourceId], subItem.title)?.label ?
+							<view v-else class="value" v-html="getValue(pageData.fieldMap[subItem.sourceId], subItem.title)?.label ?
 										getValue(pageData.fieldMap[subItem.sourceId], subItem.title)?.label :
-										getValue(pageData.fieldMap[subItem.sourceId], subItem.title) }}
+										getValue(pageData.fieldMap[subItem.sourceId], subItem.title)">
+								
 							</view>
 
 						</view>

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

@@ -44,6 +44,13 @@
         :file-list="modelValue" :disabled="subItem.disabled" :action="`${baseUrl}/v3/upload`"
         @success="success"></wd-upload>
     </wd-cell>
+	<wd-cell v-else-if="subItem.extControlType === 'html'"
+	  :rules="[{ required: subItem.required, message: `请输入${subItem.title}` }]" :title="subItem.title"
+	  title-width="100px" :prop="subItem.id">
+	 <editor id="editor"  class="ql-container" :placeholder="`请输入${subItem.title}`" show-img-size show-img-toolbar
+	 	show-img-resize  :read-only="false" @input="({html, text, delta}) => { change({value:html}) }">
+	 </editor>
+	</wd-cell>
     <wd-input v-else :disabled="subItem.disabled" :label="subItem.title" label-width="100px" :prop="subItem.id"
       clearable :modelValue="modelValue" :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`"
       :rules="[{ required: subItem.required, message: `请填写${subItem.title}` }]" @input="(e) => { change(e) }"

package/w-search/w-search.vue

@@ -22,11 +22,19 @@
               </view>
 
               <view v-else-if="item.controlType === 'datetime'">
-                <wd-calendar v-if="item.extControlType === 'datetime-HH'" :label="item.title"
-                  v-model="searchData[item.sourceId]" clearable type="datetime" />
-                <wd-calendar v-else-if="item.extControlType === 'daterange'" :type="item.extControlType"
+                
+                <wd-calendar v-if="item.extControlType === 'daterange'" :type="item.extControlType"
                   :label="item.title" v-model="searchData[item.sourceId]" clearable />
+				  <wd-calendar v-else :label="item.title"
+				    v-model="searchData[item.sourceId]" clearable type="datetime" />
               </view>
+			  
+			  <view v-else-if="item.controlType === 'date'">
+			    <wd-calendar v-if="item.extControlType === 'daterange'" :type="item.extControlType"
+			      :label="item.title" v-model="searchData[item.sourceId]" clearable />
+				  <wd-calendar v-else :type="item.extControlType"
+				    :label="item.title" v-model="searchData[item.sourceId]" clearable />
+			  </view>
 
               <wd-input v-else type="text" :label="item.title" v-model="searchData[item.sourceId]"
                 :placeholder="`请输入${item.title}`" clearable />