移动 common editor 到 common 目录

RedAnt ERP Mobile/common/CommonEditor/CommonEditor.storyboard → common/customUI/commoneditor/CommonEditor.storyboard

@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="ipad9_7" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
-        <!--DatePickerViewController-->
+        <!--Title-->
         <scene sceneID="E5d-Rh-3tk">
             <objects>
-                <viewController storyboardIdentifier="DatePickerViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="hDO-yf-YYU" userLabel="DatePickerViewController" customClass="DatePickerViewController" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="DatePickerViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="hDO-yf-YYU" customClass="DatePickerViewController" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="oEN-IW-3xG"/>
                         <viewControllerLayoutGuide type="bottom" id="RpF-H7-VSr"/>
@@ -36,7 +38,7 @@
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pXA-kN-pBh">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pXA-kN-pBh">
                                 <rect key="frame" x="330" y="483" width="108" height="39"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="39" id="MQB-L6-0h7"/>
@@ -85,7 +87,7 @@
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fRq-qQ-HYw" customClass="CommonEditorTableContainerView">
                                 <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                             </view>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -121,7 +123,7 @@
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DDb-ec-Hh3" customClass="CommonEditorTableContainerView">
                                 <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                             </view>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -208,7 +210,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Masert pack:9999" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="r8P-zz-ghp">
-                                                    <rect key="frame" x="461" y="15" width="142" height="21"/>
+                                                    <rect key="frame" x="461.5" y="15" width="141" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="21" id="d98-wP-8OV"/>
                                                     </constraints>
@@ -252,7 +254,7 @@
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6Yw-LP-Zra">
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6Yw-LP-Zra">
                                                     <rect key="frame" x="128" y="102" width="46" height="29"/>
                                                     <state key="normal" title="Button"/>
                                                     <connections>
@@ -335,21 +337,21 @@
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CnD-CA-7GQ" userLabel="action0">
+                                                <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CnD-CA-7GQ" userLabel="action0">
                                                     <rect key="frame" x="583" y="7" width="170" height="30"/>
                                                     <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <state key="normal" title="Button">
                                                         <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     </state>
                                                 </button>
-                                                <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hv6-Vm-wzL" userLabel="action3">
-                                                    <rect key="frame" x="15" y="7" width="170" height="30"/>
+                                                <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hv6-Vm-wzL" userLabel="action3">
+                                                    <rect key="frame" x="16" y="7" width="169" height="30"/>
                                                     <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <state key="normal" title="Button">
                                                         <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     </state>
                                                 </button>
-                                                <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bPv-vc-eg3" userLabel="action1">
+                                                <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bPv-vc-eg3" userLabel="action1">
                                                     <rect key="frame" x="393" y="7" width="170" height="30"/>
                                                     <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <constraints>
@@ -359,7 +361,7 @@
                                                         <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     </state>
                                                 </button>
-                                                <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fb7-qu-iUy" userLabel="action2">
+                                                <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fb7-qu-iUy" userLabel="action2">
                                                     <rect key="frame" x="204" y="7" width="170" height="30"/>
                                                     <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <constraints>
@@ -397,7 +399,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Eto-n8-WRZ">
-                                                    <rect key="frame" x="15" y="11" width="150" height="22"/>
+                                                    <rect key="frame" x="16" y="11" width="150" height="22"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="150" id="kc1-sp-Hhv"/>
                                                     </constraints>
@@ -406,7 +408,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XSt-jY-jcF">
-                                                    <rect key="frame" x="173" y="10" width="580" height="23"/>
+                                                    <rect key="frame" x="174" y="10" width="579" height="23"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -435,7 +437,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E0p-Rv-1zb">
-                                                    <rect key="frame" x="15" y="11" width="150" height="22"/>
+                                                    <rect key="frame" x="16" y="11" width="150" height="22"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="150" id="fRO-qS-a7v"/>
                                                     </constraints>
@@ -444,12 +446,12 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="HoV-0G-uys">
-                                                    <rect key="frame" x="171" y="7" width="582" height="30"/>
+                                                    <rect key="frame" x="172" y="7" width="581" height="30"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                     <textInputTraits key="textInputTraits"/>
                                                 </textField>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="*" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Igi-Fb-ILh">
-                                                    <rect key="frame" x="5" y="11" width="10" height="22"/>
+                                                    <rect key="frame" x="6" y="11" width="10" height="22"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -482,12 +484,12 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fsV-Kc-L7Z">
-                                                    <rect key="frame" x="171" y="11" width="582" height="22"/>
+                                                    <rect key="frame" x="172" y="11" width="581" height="22"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="68s-LN-X9p">
-                                                    <rect key="frame" x="15" y="11" width="150" height="22"/>
+                                                    <rect key="frame" x="16" y="11" width="150" height="22"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="150" id="eEm-0D-Kmg"/>
                                                     </constraints>
@@ -495,7 +497,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="*" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="shN-OG-xWN">
-                                                    <rect key="frame" x="5" y="11" width="10" height="22"/>
+                                                    <rect key="frame" x="6" y="11" width="10" height="22"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -528,7 +530,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GKX-OM-LDl">
-                                                    <rect key="frame" x="15" y="53" width="150" height="21"/>
+                                                    <rect key="frame" x="16" y="53" width="150" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="150" id="ABR-Cl-OHU"/>
                                                     </constraints>
@@ -537,13 +539,13 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="*" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pma-ii-OXW">
-                                                    <rect key="frame" x="173" y="59" width="10" height="22"/>
+                                                    <rect key="frame" x="174" y="59" width="10" height="22"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="Exn-gg-C5X">
-                                                    <rect key="frame" x="171" y="6" width="582" height="128"/>
+                                                    <rect key="frame" x="172" y="6" width="581" height="128"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -577,7 +579,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OZz-lo-hvF">
-                                                    <rect key="frame" x="15" y="59" width="150" height="22"/>
+                                                    <rect key="frame" x="16" y="59" width="150" height="22"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="150" id="qRB-Az-nvx"/>
                                                     </constraints>
@@ -586,13 +588,13 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="*" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VPO-Kk-Odn">
-                                                    <rect key="frame" x="5" y="59" width="10" height="22"/>
+                                                    <rect key="frame" x="6" y="59" width="10" height="22"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="l6i-Tj-KRU">
-                                                    <rect key="frame" x="171" y="10" width="582" height="120"/>
+                                                    <rect key="frame" x="172" y="10" width="581" height="120"/>
                                                 </imageView>
                                             </subviews>
                                             <constraints>
@@ -622,7 +624,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7iy-PQ-jHE">
-                                                    <rect key="frame" x="15" y="11" width="681" height="22"/>
+                                                    <rect key="frame" x="16" y="11" width="680" height="22"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -631,7 +633,7 @@
                                                     <rect key="frame" x="704" y="6" width="51" height="32"/>
                                                 </switch>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="*" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="alA-4a-5Hp">
-                                                    <rect key="frame" x="5" y="11" width="10" height="22"/>
+                                                    <rect key="frame" x="6" y="11" width="10" height="22"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -664,7 +666,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GS6-Z7-fOK">
-                                                    <rect key="frame" x="15" y="53" width="150" height="21"/>
+                                                    <rect key="frame" x="16" y="53" width="150" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="150" id="VqM-TE-997"/>
                                                     </constraints>
@@ -672,8 +674,8 @@
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HmT-qo-FM0">
-                                                    <rect key="frame" x="653" y="10" width="100" height="100"/>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HmT-qo-FM0">
+                                                    <rect key="frame" x="652" y="10" width="100" height="100"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="100" id="Kiu-nx-sHs"/>
                                                     </constraints>
@@ -682,7 +684,7 @@
                                                     </connections>
                                                 </button>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dTl-qp-Cvg">
-                                                    <rect key="frame" x="171" y="53" width="474" height="21"/>
+                                                    <rect key="frame" x="172" y="53" width="472" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -745,7 +747,7 @@
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="O2x-9a-T6K" customClass="CommonEditorTableContainerView">
                                 <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                             </view>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -933,5 +935,8 @@
     </scenes>
     <resources>
         <image name="check_1_24" width="24" height="24"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>

RedAnt ERP Mobile/common/CommonEditor/CommonEditorCellModel.m → common/customUI/commoneditor/CommonEditorCellModel.m

@@ -8,7 +8,11 @@
 
 #import "CommonEditorCellModel.h"
 #import "RAUtils.h"
+#if defined(BUILD_NPD)
 #import "BundleModelViewController.h"
+
+#endif
+
 #import "const.h"
 #import "config.h"
 
@@ -35,8 +39,13 @@
 //    
 ////    [self addGestureRecognizer: [[UILongPressGestureRecognizer alloc]initWithTarget:self action:@selector(longTap:)]];
 //}
+
+
+
 - (IBAction)onClickBundle:(UIButton *)sender {
+
     
+#if defined(BUILD_NPD)
     UIViewController* vc=[RAUtils getViewController :sender];
     
     
@@ -61,6 +70,7 @@
         //   self.btop = false;
         //  <#code#>
     }];
+#endif
     
 }
 

RedAnt ERP Mobile/common/CommonEditor/CommonEditorViewController.h → common/customUI/commoneditor/CommonEditorViewController.h

@@ -12,7 +12,7 @@
 #import "MonthPickerViewController.h"
 #import "CommonEditorTableContainerView.h"
 #import "CommonEditorAutoCompleteView.h"
-#import "RANetwork.h"
+#import "RADataProvider.h"
 
 @interface subitem_data : NSObject
 @property (strong, nonatomic) NSMutableDictionary *params;
@@ -33,6 +33,8 @@
 
 @property (strong,nonatomic) CommonEditorAutoCompleteView * autocompleteView;
 @property (strong,nonatomic) NSMutableArray* content_data_control;
+
+@property (strong,nonatomic) NSArray* injectMenu;
 @property int url_type;
 @property (strong,nonatomic) NSString* request_url;
 
@@ -120,4 +122,9 @@
 // plae order 有调用
 -(NSMutableDictionary*) enum_subitem_changed:(NSMutableDictionary *) item subid:(NSArray*) subid value:(NSMutableDictionary*)value step:(int) step;
 
+
+
+#pragma mark 为子类暴露的接口
+-(void) handle_editor_cell_select:(UITableView *)tableView IndexPath:(NSIndexPath *)indexPath;
+
 @end

RedAnt ERP Mobile/common/CommonEditor/CommonEditorViewController.m → common/customUI/commoneditor/CommonEditorViewController.m

@@ -8,8 +8,10 @@
 
 #import "CommonEditorViewController.h"
 #import "CommonEditorCellEdit.h"
-#import "RANetwork.h"
+#import "RASingleton.h"
+//#import "RANetwork.h"
 #import "CommonEditorCellEnum.h"
+#import "CommonEditorCellEditor.h"
 #import "CommonEditorCellSwitch.h"
 #import "CommonEditorCellModel.h"
 #import "CommonEditorCellAction.h"
@@ -40,7 +42,7 @@
 #import "OLDataProvider.h"
 # endif
 #import <objc/objc.h>
-#import "MainViewController.h"
+//#import "MainViewController.h"
 
 #import "AppDelegate.h"
 
@@ -159,6 +161,8 @@
     [self.editorTable registerNib:[UINib nibWithNibName:@"Phone_Range_Cell" bundle:nil] forCellReuseIdentifier:@"CommonEditorRangeCell"];
     [self.editorTable registerNib:[UINib nibWithNibName:@"Phone_Web_Cell" bundle:nil] forCellReuseIdentifier:@"CommonEditorWebCell"];
     [self.editorTable registerNib:[UINib nibWithNibName:@"Phone_Banner_Cell" bundle:nil] forCellReuseIdentifier:@"CommonEditorBannerCell"];
+    
+    [self.editorTable registerNib:[UINib nibWithNibName:@"Phone_Editor_Cell" bundle:nil] forCellReuseIdentifier:@"CommonEditorCellEditor"];
 }
 
 
@@ -174,6 +178,9 @@
     [self.editorTable registerNib:[UINib nibWithNibName:@"iPadCommonEditorCellSignature" bundle:nil] forCellReuseIdentifier:@"CommonEditorCellSignature"];
     [self.editorTable registerNib:[UINib nibWithNibName:@"iPadCommonEditorCellSwitch" bundle:nil] forCellReuseIdentifier:@"CommonEditorCellSwitch"];
     [self.editorTable registerNib:[UINib nibWithNibName:@"iPadCommonEditorCellTextView" bundle:nil] forCellReuseIdentifier:@"CommonEditorCellTextView"];
+    
+    
+    
 //    [self.editorTable registerNib:[UINib nibWithNibName:@"iPadCommonEditorRangeCell" bundle:nil] forCellReuseIdentifier:@"CommonEditorRangeCell"];
 //    [self.editorTable registerNib:[UINib nibWithNibName:@"iPadCommonEditorWebCell" bundle:nil] forCellReuseIdentifier:@"CommonEditorWebCell"];
 //    [self.editorTable registerNib:[UINib nibWithNibName:@"iPadCommonEditorBannerCell" bundle:nil] forCellReuseIdentifier:@"CommonEditorBannerCell"];
@@ -227,7 +234,7 @@
             appDelegate=(AppDelegate*)[[UIApplication sharedApplication] delegate];
         });
 //        AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
-        NSDictionary *urgencyDic = [appDelegate globalParameterForKey:@"urgencyDic"];
+        NSDictionary *urgencyDic = [RASingleton.sharedInstance globalParameterForKey:@"urgencyDic"];
         
         id count = [urgencyDic objectForKey:@"count"];
         
@@ -405,7 +412,7 @@
     {
         
         __block UIAlertController * waitalert = [RAUtils waiting_alert:self message:self.loading_msg title:self.loading_title completion:^{
-            [RANetwork request_editor:self.request_url params:self.params completionHandler:^(NSMutableDictionary *result) {
+            [RADataProvider request_editor:self.request_url params:self.params completionHandler:^(NSMutableDictionary *result) {
                 NSMutableDictionary* editor_json = result;
                 DebugLog(@"data string: %@",[RAConvertor dict2string:editor_json] );
                 
@@ -414,6 +421,12 @@
                 [waitalert dismissViewControllerAnimated:YES completion:^{
                     if([[editor_json valueForKey:@"result"] intValue]==2)
                     {
+                        NSArray* arr_menu =editor_json[@"menu"];
+                        
+                        if( arr_menu !=nil)
+                        {
+                            [self injectMenu:arr_menu];
+                        }
                         
                         weakself.content_data_download = [editor_json mutableCopy];
                         
@@ -450,45 +463,6 @@
         }];
         
                 
-//        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-//
-//            NSDictionary* editor_json = [weakself request_Editor:weakself.request_url params:weakself.params];
-//            DebugLog(@"data string: %@",[RAConvertor dict2string:editor_json] );
-//            dispatch_async(dispatch_get_main_queue(), ^{
-//
-//                [waitalert dismissViewControllerAnimated:YES completion:nil];
-//
-//
-//                if([[editor_json valueForKey:@"result"] intValue]==2)
-//                {
-//
-//                    weakself.content_data_download = [editor_json mutableCopy];
-//
-//                    weakself.content_data_control = [weakself translate_json:weakself.content_data_download changed: weakself.changed_data];
-//
-//                    //                self.content_data = [editor_json mutableCopy];
-//                    //                    self.content_data = [self translate_json:editor_json];
-//
-//                    //                  NSMutableDictionary* content_data1 = [self translate_json:self.content_data];
-//
-//                    [weakself download_success];
-//
-//                    [weakself.editorTable reloadData];
-//
-//                    //                NSString * ttt=[self.content_data valueForKey:@"title"] ;
-//
-//                    weakself.navigationItem.title =  [weakself.content_data_download valueForKey:@"title"] ;
-//                }
-//                else
-//                {
-//                    [weakself download_failed];
-//                    [weakself alertMessage:[editor_json valueForKey:@"err_msg"]];
-//
-//                }
-//
-//
-//            });
-//        });
     }
     else if(self.url_type== URL_LOCAL )
     {
@@ -526,7 +500,25 @@
         self.url_type = URL_REMOTE;
     }
 }
+-(void) injectMenu:(NSArray* ) menu
+{
+    
+
+    
+    UIBarButtonItem *menuItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"ic_more_dot"] style:UIBarButtonItemStylePlain target:self action:@selector(menuItemClick:)];
+    self.injectMenu = menu;
 
+    //    //    closeButton.title = @"Close";
+    //
+        self.navigationItem.rightBarButtonItem = menuItem;
+    
+}
+
+
+- (void)menuItemClick:(id)sender {
+    
+    NSAssert(true, ([NSString stringWithFormat:@"%@ menuItemClick not impl",[self class_name]]));
+}
 -(NSMutableDictionary*) check_cancommit :(bool) alert
 {
     [[[UIApplication sharedApplication] keyWindow] endEditing:YES];
@@ -1382,7 +1374,7 @@
                    [self.params setObject:obj_str forKey:(NSString*)changed_key[i]];
                }
         __block UIAlertController * waitalert = [RAUtils waiting_alert:self message:self.loading_msg title:self.loading_title completion:^{
-            [RANetwork request_editor:self.request_url params:self.params completionHandler:^(NSMutableDictionary *result) {
+            [RADataProvider request_editor:self.request_url params:self.params completionHandler:^(NSMutableDictionary *result) {
                 NSMutableDictionary* editor_json = result;
                 DebugLog(@"data string: %@",[RAConvertor dict2string:editor_json] );
                 
@@ -1419,50 +1411,6 @@
         }];
         
        
-        
-        //        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-//
-//
-//
-//            NSDictionary* refresh_params=[weakself get_refresh_param];
-//
-//            NSArray* changed_key=[refresh_params allKeys];
-//            for(int i=0;i<changed_key.count;i++)
-//            {
-//                NSString* obj_str=[NSString stringWithFormat:@"%@",[refresh_params valueForKey:(NSString*)changed_key[i]]];
-//                [weakself.params setObject:obj_str forKey:(NSString*)changed_key[i]];
-//            }
-//
-//            NSDictionary* editor_json = [weakself request_Editor:weakself.request_url params:weakself.params];
-//            DebugLog(@"data string: %@",[RAConvertor dict2string:editor_json] );
-//
-//            dispatch_async(dispatch_get_main_queue(), ^{
-//                [waitalert dismissViewControllerAnimated:YES completion:nil];
-//
-//
-//                if([[editor_json valueForKey:@"result"] intValue]==2)
-//                {
-//
-//                    weakself.content_data_download = [weakself CopyDirty:weakself.content_data_download to:[editor_json mutableCopy]];//[editor_json mutableCopy];
-//
-//                    weakself.content_data_control = [weakself translate_json:weakself.content_data_download changed: weakself.changed_data];
-//
-//
-//                    [weakself download_success];
-//                    [weakself.editorTable reloadData];
-//
-//                }
-//                else
-//                {
-//                    [weakself download_failed];
-//                    [weakself alertMessage:[editor_json valueForKey:@"err_msg"]];
-//                }
-//
-//
-//
-//
-//            });
-//        });
     }
     else
     {
@@ -2625,7 +2573,7 @@
             
             __weak typeof(self) weakself = self;
             __block UIAlertController * waitalert = [RAUtils waiting_alert:self message:self.loading_msg title:self.loading_title completion:^{
-                [RANetwork request_commoneditor_partialrefresh:params url:url completionHandler:^(NSMutableDictionary *result) {
+                [RADataProvider request_commoneditor_partialrefresh:params url:url completionHandler:^(NSMutableDictionary *result) {
                     NSDictionary* editor_json =result;
                     [waitalert dismissViewControllerAnimated:YES completion:^{
                         if([[editor_json valueForKey:@"result"] intValue]==2)
@@ -2778,7 +2726,7 @@
             __weak typeof(self) weakself = self;
             
             __block UIAlertController * waitalert = [RAUtils waiting_alert:self message:self.loading_msg title:self.loading_title completion:^{
-                [RANetwork request_commoneditor_partialrefresh:params url:url completionHandler:^(NSMutableDictionary *result) {
+                [RADataProvider request_commoneditor_partialrefresh:params url:url completionHandler:^(NSMutableDictionary *result) {
                     NSDictionary* editor_json = result;
                     [waitalert dismissViewControllerAnimated:YES completion:^{
                         if([[editor_json valueForKey:@"result"] intValue]==2)
@@ -3829,11 +3777,11 @@
                     }
                     
                     NSString* type=[item_json valueForKey:@"type"] ;
-                    
+                    // 此处应移动到erp mobile 项目内
                     if([type isEqualToString:@"price"])
                     {
-                        BOOL can_see_price = [[appDelegate globalParameterForKey:@"can_see_price"] boolValue];
-                        BOOL price_hidden = [[appDelegate globalParameterForKey:@"price_hidden"] boolValue];
+                        BOOL can_see_price = [[RASingleton.sharedInstance globalParameterForKey:@"can_see_price"] boolValue];
+                        BOOL price_hidden = [[RASingleton.sharedInstance globalParameterForKey:@"price_hidden"] boolValue];
                         
                         if(can_see_price&&price_hidden==false)
                         {
@@ -4023,8 +3971,61 @@
             cell.accessoryType = UITableViewCellAccessoryNone;
             cell.backgroundColor = [UIColor whiteColor];
             return cell;
+         
             
-        } else  if([control isEqualToString:@"enum"])
+        }
+        else  if([control isEqualToString:@"editor"])
+        {
+            CellIdentifier = @"CommonEditorCellEditor";
+            CommonEditorCellEditor * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
+            NSString* title = [[item_json valueForKey:@"aname"] stringValue];
+            NSString* value = [[item_json valueForKey:@"value"] stringValue];
+            
+            int disable = [[item_json valueForKey:@"disable"] intValue];
+            if(disable==1||readonly)
+            {
+                cell.labelValue.textColor= [UIColor lightGrayColor];
+                
+            }
+            else
+            {
+                cell.labelValue.textColor= [UIColor blackColor];
+                //            cell.textfield.backgroundColor = [UIColor whiteColor];
+            }
+            
+            
+            NSString* align =[item_json valueForKey:@"align"];
+            if([align isEqualToString:@"right"])
+                cell.labelValue.textAlignment= NSTextAlignmentRight;
+            else
+                cell.labelValue.textAlignment =NSTextAlignmentLeft;
+            
+            cell.labelName.text=title;
+            cell.labelValue.text=value;
+            
+            
+//            if([required isEqualToString:@"true"])
+//            {
+//                [cell.labelTitle sizeToFit];
+//                CGRect frame =cell.labelTitle.frame;
+//                frame= CGRectMake(frame.origin.x+frame.size.width, frame.origin.y, 10, 21);
+//                cell.starMark.frame = frame;
+//                cell.starMark.hidden=false;
+//                //  [title appendString:@"*"];
+//
+//                //  [title appendString:@"<font size=\"6\" >*</font>"];
+//                // NSString * htmlString = @"<html><body> Some html string \n <font size=\"13\" color=\"red\">This is some text!</font> </body></html>";
+//            }
+//            else
+//            {
+//                [cell.labelTitle sizeToFit];
+//                cell.starMark.hidden=true;
+//            }
+            
+            cell.backgroundColor = [UIColor whiteColor];
+            return cell;
+        }
+        else  if([control isEqualToString:@"enum"])
         {
             
             
@@ -4202,8 +4203,8 @@
             NSString* totalprice = [NSString stringWithFormat:@"%.2f",(unitprice* (1.0-discount/100)+dprice)*count];
             
             
-            BOOL can_see_price = [[appDelegate globalParameterForKey:@"can_see_price"] boolValue];
-            BOOL price_hidden = [[appDelegate globalParameterForKey:@"price_hidden"] boolValue];
+            BOOL can_see_price = [[RASingleton.sharedInstance globalParameterForKey:@"can_see_price"] boolValue];
+            BOOL price_hidden = [[RASingleton.sharedInstance globalParameterForKey:@"price_hidden"] boolValue];
             
             if(can_see_price&&price_hidden==false)
             {
@@ -4617,7 +4618,7 @@
 
 - (UIView *) tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
 {
-    
+//    return [super tableview:tableView viewForHeaderInSection:section];
     NSString* value =[DefaultAppearance get_noneappearance_value:@"DefaultTableHeaderView" valuename:@"title_text_color"];
     if(value==nil)
         value=@"";
@@ -4713,6 +4714,8 @@
     //    [statuslabel sizeToFit];
     //    [myView addSubview:statuslabel];
     //
+    myView.backgroundColor = UIColor.lightGrayColor;
+    UIColor * c=myView.backgroundColor;
     return myView;
 }
 
@@ -4775,7 +4778,12 @@
         
         [self.navigationController pushViewController:enumvc animated:true];
         
-    }else if([control isEqualToString:@"action"])
+    }
+    else if([control isEqualToString:@"editor"])
+    {
+        [self handle_editor_cell_select:tableView IndexPath:indexPath];
+    }
+    else if([control isEqualToString:@"action"])
     {
         if (disable || readonly) {
             return nil;
@@ -4798,7 +4806,7 @@
         NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
         
         
-        
+
         
         DatePickerViewController* dpvc =[ [UIStoryboard storyboardWithName:@"CommonEditor" bundle:nil] instantiateViewControllerWithIdentifier:@"DatePickerViewController"];
         if([[type lowercaseString] isEqualToString:@"date"])
@@ -4816,10 +4824,21 @@
             dpvc.pickerMode = UIDatePickerModeDateAndTime;
             [dateFormatter setDateFormat:@"yyyy/MM/dd HH:mm:ss"];
         }
+        
+        __weak typeof(self) weakSelf = self;
+        
         NSDate *date = [dateFormatter dateFromString:value];
         dpvc.date = date;
         dpvc.formatter = dateFormatter;
         dpvc.labelTime.text = value;
+        dpvc.blk_Set=^(NSString *date)
+        {
+            
+            
+            
+                [weakSelf DateTimeValueChanged:date indexPath:indexPath];
+          
+        };
         [self.navigationController pushViewController:dpvc animated:true];
         
     }else if([control isEqualToString:@"monthpicker"])
@@ -4961,8 +4980,8 @@
                 
                 NSMutableDictionary* params = [[NSMutableDictionary alloc] init];
                 AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-                NSString *user = [appDelegate globalParameterForKey:@"user"];
-                NSString *password = [appDelegate globalParameterForKey:@"password"];
+                NSString *user = [RASingleton.sharedInstance globalParameterForKey:@"user"];
+                NSString *password = [RASingleton.sharedInstance globalParameterForKey:@"password"];
                 
                 if(user!=nil)
                     [params setValue:user forKey:@"user"];
@@ -5239,6 +5258,80 @@
     self.content_data_control = [self translate_json:self.content_data_download changed:self.changed_data];
     [self.editorTable reloadData ];
 }
+#pragma mark datetimeChanged
+-(void) DateTimeValueChanged:(NSString *)value indexPath :(NSIndexPath*) indexPath
+{
+    
+    
+    
+    NSMutableDictionary* section_json=nil;
+    
+    
+    //    DebugLog(@"endedit %d_%d",indexPath.section,indexPath.row);
+    NSMutableDictionary* item_json =[((NSMutableArray*)self.content_data_control[indexPath.section])[indexPath.row] mutableCopy];
+    
+    int refresh = [[item_json valueForKey:@"refresh"] intValue];
+    NSString* refresh_trigger = [item_json valueForKey:@"name"];
+    NSString* subid=[item_json valueForKey:@"subid"];
+    
+    
+    //    NSArray* imgs=[RAUtils string2arr:url_up separator:@","];
+    
+    
+    //    imgs[index];
+ 
+    item_json[@"value"]=value;
+   
+    [item_json setValue:@"true" forKey:@"dirty"];
+    if(subid==nil)
+    {
+        section_json = [[self.content_data_download objectForKey:[NSString stringWithFormat:@"section_%ld",(long)indexPath.section ]] mutableCopy];
+        int count=0;
+        
+        count=[[section_json valueForKey:@"count"] intValue];
+        
+        for(int i=0;i<count;i++)
+        {
+            NSDictionary * olditem=[section_json objectForKey:[NSString stringWithFormat:@"item_%d",i ]];
+            if([[olditem valueForKey:@"name"] isEqualToString:[item_json valueForKey:@"name" ]])
+                [section_json setObject:item_json  forKey:[NSString stringWithFormat:@"item_%d",i ]];
+            
+            
+        }
+        
+    }
+    else
+    {
+        NSArray* idarr=[subid componentsSeparatedByString:@"_"];
+        int section = [(NSString*)idarr[0] intValue];
+        int item=[(NSString*)idarr[1] intValue];
+        
+        
+        section_json = [[self.content_data_download objectForKey:[NSString stringWithFormat:@"section_%d", section]] mutableCopy];
+        NSDictionary * olditem=[section_json objectForKey:[NSString stringWithFormat:@"item_%d",item ]];
+        item_json= [self enum_subitem_changed:[olditem mutableCopy] subid:idarr value:item_json step:2];
+        [item_json setValue:@"true" forKey:@"dirty"];
+        [section_json setObject:item_json  forKey:[NSString stringWithFormat:@"item_%d",item ]];
+    }
+    
+    
+    
+    [self.content_data_download setObject:section_json forKey:[NSString stringWithFormat:@"section_%ld",(long)indexPath.section ]];
+    
+    self.content_data_control = [self translate_json:self.content_data_download changed: self.changed_data];
+    
+    //  NSRange range = NSMakeRange(indexPath.section, 1);
+    //   NSIndexSet *sectionToReload = [NSIndexSet indexSetWithIndexesInRange:range];
+    //  [self.editorTable reloadSections:sectionToReload withRowAnimation:UITableViewRowAnimationAutomatic];
+    
+    
+    if(refresh==1)
+    {
+        [self refresh:refresh_trigger];
+    }
+    [self.editorTable reloadData ];
+}
+
 #pragma mark EnumSelectViewControllerDelegate
 
 -(void) setEnumValue:(NSMutableDictionary *)value indexPath :(NSIndexPath*) indexPath
@@ -6414,7 +6507,8 @@
 
 
 
-//#pragma mark Request Editor
+#pragma mark Request Editor
+
 //-(NSDictionary*)request_Editor:(NSString*) request_url params:(NSMutableDictionary*)params
 //{
 //    return [RANetwork request_Editor:request_url params:params];
@@ -6923,7 +7017,14 @@
         [self presentViewController:preVC animated:true completion:nil];
     }
 }
-
+#pragma mark 为子类暴露的接口
+-(void) handle_editor_cell_select:(UITableView *)tableView IndexPath:(NSIndexPath *)indexPath
+{
+    
+    
+    NSAssert(true, ([NSString stringWithFormat:@"%@ handle_editor_cell_select not impl",[self class_name]]));
+    
+}
 @end
 
 

RedAnt ERP Mobile/common/CommonEditor/DatePickerViewController.m → common/customUI/commoneditor/DatePickerViewController.m

@@ -31,7 +31,7 @@
     
     
     if(self.blk_Set)
-        self.blk_Set(self.labelTime.text);
+        self.blk_Set([self.formatter stringFromDate:self.datePicker.date]);
     [self.navigationController popViewControllerAnimated:false];
 }
 

RedAnt Mobile/RedAnt Mobile/Phone_Edit_Cell.xib → common/customUI/commoneditor/Phone_Edit_Cell.xib

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -15,41 +14,40 @@
             <rect key="frame" x="0.0" y="0.0" width="768" height="80"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="CyK-ET-3f1" id="Npe-Gj-5ti">
-                <rect key="frame" x="0.0" y="0.0" width="768" height="79.5"/>
+                <rect key="frame" x="0.0" y="0.0" width="768" height="80"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kNq-8q-AlZ">
-                        <rect key="frame" x="15" y="11" width="738" height="21"/>
+                        <rect key="frame" x="15" y="10" width="41.5" height="21"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="*" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xrz-F7-OEY">
-                        <rect key="frame" x="5" y="11" width="10" height="21"/>
+                        <rect key="frame" x="61.5" y="10" width="10" height="21"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="21" id="GAv-38-7PX"/>
-                            <constraint firstAttribute="width" constant="10" id="d7V-Km-0GK"/>
                         </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="25"/>
-                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="textColor" systemColor="systemRedColor"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="KE4-3k-TVw">
-                        <rect key="frame" x="15" y="40" width="738" height="30"/>
+                        <rect key="frame" x="15" y="35" width="738" height="35"/>
                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                         <textInputTraits key="textInputTraits"/>
                     </textField>
                 </subviews>
                 <constraints>
+                    <constraint firstItem="KE4-3k-TVw" firstAttribute="top" secondItem="Xrz-F7-OEY" secondAttribute="bottom" constant="4" id="2Yf-Dj-b88"/>
                     <constraint firstAttribute="trailing" secondItem="KE4-3k-TVw" secondAttribute="trailing" constant="15" id="2z7-oK-BaO"/>
                     <constraint firstItem="KE4-3k-TVw" firstAttribute="leading" secondItem="Npe-Gj-5ti" secondAttribute="leading" constant="15" id="80j-DT-DV0"/>
-                    <constraint firstItem="kNq-8q-AlZ" firstAttribute="leading" secondItem="Xrz-F7-OEY" secondAttribute="trailing" id="C52-f5-pkM"/>
-                    <constraint firstItem="kNq-8q-AlZ" firstAttribute="top" secondItem="Npe-Gj-5ti" secondAttribute="top" constant="11" id="Gvr-FZ-0Kc"/>
-                    <constraint firstItem="Xrz-F7-OEY" firstAttribute="leading" secondItem="Npe-Gj-5ti" secondAttribute="leading" constant="5" id="SfB-SR-hE8"/>
-                    <constraint firstAttribute="bottom" secondItem="KE4-3k-TVw" secondAttribute="bottom" constant="9.5" id="lSv-gx-6Au"/>
-                    <constraint firstItem="KE4-3k-TVw" firstAttribute="top" secondItem="kNq-8q-AlZ" secondAttribute="bottom" constant="8" id="tky-UC-w15"/>
-                    <constraint firstAttribute="trailing" secondItem="kNq-8q-AlZ" secondAttribute="trailing" constant="15" id="uKC-We-Yeb"/>
-                    <constraint firstItem="Xrz-F7-OEY" firstAttribute="top" secondItem="Npe-Gj-5ti" secondAttribute="top" constant="11" id="ul3-VM-nef"/>
+                    <constraint firstItem="kNq-8q-AlZ" firstAttribute="top" secondItem="Npe-Gj-5ti" secondAttribute="top" constant="10" id="Gvr-FZ-0Kc"/>
+                    <constraint firstItem="Xrz-F7-OEY" firstAttribute="leading" secondItem="kNq-8q-AlZ" secondAttribute="trailing" constant="5" id="MqW-0W-Pp9"/>
+                    <constraint firstItem="Xrz-F7-OEY" firstAttribute="top" secondItem="kNq-8q-AlZ" secondAttribute="top" id="cr6-CI-H9h"/>
+                    <constraint firstItem="kNq-8q-AlZ" firstAttribute="leading" secondItem="Npe-Gj-5ti" secondAttribute="leading" constant="15" id="g99-pa-pYA"/>
+                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="kNq-8q-AlZ" secondAttribute="trailing" constant="30" id="gXK-xv-QFY"/>
+                    <constraint firstAttribute="bottom" secondItem="KE4-3k-TVw" secondAttribute="bottom" constant="10" id="lSv-gx-6Au"/>
                 </constraints>
             </tableViewCellContentView>
             <connections>
@@ -57,6 +55,12 @@
                 <outlet property="starMark" destination="Xrz-F7-OEY" id="awd-7r-7bx"/>
                 <outlet property="textfield" destination="KE4-3k-TVw" id="2bJ-5l-Wr8"/>
             </connections>
+            <point key="canvasLocation" x="133" y="76"/>
         </tableViewCell>
     </objects>
+    <resources>
+        <systemColor name="systemRedColor">
+            <color red="1" green="0.23137254901960785" blue="0.18823529411764706" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+    </resources>
 </document>

RedAnt Mobile/RedAnt Mobile/Phone_Label_Cell.xib → common/customUI/commoneditor/Phone_Label_Cell.xib

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -15,28 +13,29 @@
             <rect key="frame" x="0.0" y="0.0" width="768" height="80"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ShR-kM-WOh" id="yAY-rd-KOV">
-                <rect key="frame" x="0.0" y="0.0" width="768" height="79.5"/>
+                <rect key="frame" x="0.0" y="0.0" width="768" height="80"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kvw-G1-uhU">
-                        <rect key="frame" x="10" y="11" width="42" height="21"/>
+                        <rect key="frame" x="10" y="10" width="748" height="21"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IFO-cL-5rq">
-                        <rect key="frame" x="10" y="50" width="748" height="21"/>
+                        <rect key="frame" x="10" y="49" width="748" height="21"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                 </subviews>
                 <constraints>
+                    <constraint firstAttribute="trailing" secondItem="Kvw-G1-uhU" secondAttribute="trailing" constant="10" id="4ME-gc-xVP"/>
                     <constraint firstAttribute="trailing" secondItem="IFO-cL-5rq" secondAttribute="trailing" constant="10" id="79w-bf-qBl"/>
                     <constraint firstItem="IFO-cL-5rq" firstAttribute="top" secondItem="Kvw-G1-uhU" secondAttribute="bottom" constant="18" id="COb-2q-bH5"/>
                     <constraint firstItem="IFO-cL-5rq" firstAttribute="leading" secondItem="yAY-rd-KOV" secondAttribute="leading" constant="10" id="Vjp-hN-KBl"/>
-                    <constraint firstAttribute="bottom" secondItem="IFO-cL-5rq" secondAttribute="bottom" constant="8.5" id="WhZ-rT-G20"/>
-                    <constraint firstItem="Kvw-G1-uhU" firstAttribute="top" secondItem="yAY-rd-KOV" secondAttribute="top" constant="11" id="bjK-ex-H7V"/>
+                    <constraint firstAttribute="bottom" secondItem="IFO-cL-5rq" secondAttribute="bottom" constant="10" id="WhZ-rT-G20"/>
+                    <constraint firstItem="Kvw-G1-uhU" firstAttribute="top" secondItem="yAY-rd-KOV" secondAttribute="top" constant="10" id="bjK-ex-H7V"/>
                     <constraint firstItem="Kvw-G1-uhU" firstAttribute="leading" secondItem="yAY-rd-KOV" secondAttribute="leading" constant="10" id="c0q-Lp-Cnn"/>
                 </constraints>
             </tableViewCellContentView>
@@ -44,6 +43,7 @@
                 <outlet property="labelTitle" destination="Kvw-G1-uhU" id="9Rv-FP-mkR"/>
                 <outlet property="labelValue" destination="IFO-cL-5rq" id="pUl-2J-A87"/>
             </connections>
+            <point key="canvasLocation" x="133" y="76"/>
         </tableViewCell>
     </objects>
 </document>